JBoss Tools SVN: r22114 - in trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta: impl and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-05-17 06:20:56 -0400 (Mon, 17 May 2010)
New Revision: 22114
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/constraint/impl/XAttributeConstraintImpl.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/constraint/impl/XAttributeConstraintJavaName.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XAttributeImpl.java
Log:
https://jira.jboss.org/browse/JBIDE-6295
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/constraint/impl/XAttributeConstraintImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/constraint/impl/XAttributeConstraintImpl.java 2010-05-17 09:29:51 UTC (rev 22113)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/constraint/impl/XAttributeConstraintImpl.java 2010-05-17 10:20:56 UTC (rev 22114)
@@ -11,13 +11,23 @@
package org.jboss.tools.common.meta.constraint.impl;
import org.w3c.dom.*;
+import org.jboss.tools.common.meta.XAttribute;
import org.jboss.tools.common.meta.constraint.*;
import org.jboss.tools.common.meta.impl.*;
public class XAttributeConstraintImpl extends XMetaElementImpl implements XAttributeConstraint {
+ /**
+ * It happens that some data useful for constraint, e.g. that attribute is required,
+ * is contained at the attribute object.
+ */
+ protected XAttribute attribute;
public XAttributeConstraintImpl() {}
+ public void setAttribute(XAttribute attribute) {
+ this.attribute = attribute;
+ }
+
public boolean accepts(String value){
return true;
}
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/constraint/impl/XAttributeConstraintJavaName.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/constraint/impl/XAttributeConstraintJavaName.java 2010-05-17 09:29:51 UTC (rev 22113)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/constraint/impl/XAttributeConstraintJavaName.java 2010-05-17 10:20:56 UTC (rev 22114)
@@ -65,7 +65,7 @@
}
public String getError(String value) {
- return (value.length() == 0) ? ModelMessages.CONSTRAINT_NONEMPTY :
+ return (value.length() == 0) ? (isRequired() ? ModelMessages.CONSTRAINT_NONEMPTY : null) :
accepts(value) ? null :
(keytable.contains(value)) ? ModelMessages.CONSTRAINT_NO_JAVA_KEYWORD :
(!allowPrimitiveTypes && primitiveSet.contains(value)) ? ModelMessages.CONSTRAINT_NO_JAVA_KEYWORD :
@@ -73,6 +73,10 @@
ModelMessages.CONSTRAINT_JAVA_NAME;
}
+ boolean isRequired() {
+ return attribute != null && "always".equals(attribute.getProperty("save")); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
public String getCorrectedValue(String value) {
if(value == null || value.length() == 0) return null;
if(XModelObjectConstants.TRUE.equals(getProperties().getProperty("acceptIncorrect"))) return value; //$NON-NLS-1$
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XAttributeImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XAttributeImpl.java 2010-05-17 09:29:51 UTC (rev 22113)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XAttributeImpl.java 2010-05-17 10:20:56 UTC (rev 22114)
@@ -23,7 +23,7 @@
protected XAttributeEditor m_Editor;
protected String m_DefValue;
protected boolean m_Visible;
- protected ConstraintHolder constraint = new ConstraintHolder();
+ protected ConstraintHolder constraint = new ConstraintHolder(this);
protected boolean m_Required;
protected boolean m_Editable;
protected boolean trimmable;
@@ -256,11 +256,14 @@
}
class ConstraintHolder {
+ XAttributeImpl attribute;
private XAttributeConstraint constraint;
private String loader;
private Element element;
- public ConstraintHolder() {}
+ public ConstraintHolder(XAttributeImpl attribute) {
+ this.attribute = attribute;
+ }
public void init(String loader, Element element) {
this.loader = loader;
@@ -291,6 +294,9 @@
}
if(constraint == null) constraint = new XAttributeConstraintImpl();
+ if(constraint instanceof XAttributeConstraintImpl) {
+ ((XAttributeConstraintImpl)constraint).setAttribute(attribute);
+ }
if(element != null)
((XAttributeConstraintImpl)constraint).load(element);
loader = null;
15 years, 11 months
- 1
- 0
JBoss Tools SVN: r22113 - in workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces: utill and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2010-05-17 05:29:51 -0400 (Mon, 17 May 2010)
New Revision: 22113
Modified:
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceCommandButtonTemplate.java
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceFacesOutputTextTemplate.java
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceFacesSelectBooleanCheckboxTemplate.java
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceInputTextTemplate.java
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/utill/VpeRendererUtil.java
Log:
Code has been refactored,https://jira.jboss.org/browse/JBIDE-4710
Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceCommandButtonTemplate.java
===================================================================
--- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceCommandButtonTemplate.java 2010-05-17 08:53:42 UTC (rev 22112)
+++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceCommandButtonTemplate.java 2010-05-17 09:29:51 UTC (rev 22113)
@@ -12,18 +12,13 @@
import javax.faces.render.Renderer;
-import org.jboss.tools.jsf.vpe.icefaces.IceFacesActivator;
import org.jboss.tools.jsf.vpe.icefaces.utill.VpeRendererUtil;
import org.jboss.tools.jsf.vpe.template.mock.impl.VpeFacesContext;
import org.jboss.tools.jsf.vpe.template.mock.impl.VpeUICommand;
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate;
import org.jboss.tools.vpe.editor.template.VpeCreationData;
-import org.jboss.tools.vpe.editor.template.VpeTemplateManager;
-import org.jboss.tools.vpe.editor.util.VisualDomUtil;
import org.mozilla.interfaces.nsIDOMDocument;
-import org.mozilla.interfaces.nsIDOMElement;
-import org.mozilla.interfaces.nsIDOMNode;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -35,26 +30,11 @@
public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
nsIDOMDocument visualDocument) {
- try {
VpeFacesContext.getInstance().setResponseWriter(null);
Renderer render = new com.icesoft.faces.component.ext.renderkit.ButtonRenderer();
VpeUICommand uiComponent = new VpeUICommand(
(Element) sourceNode);
- Node result = VpeRendererUtil.processRenderer(render, uiComponent);
- nsIDOMNode resultVisualNode = VpeRendererUtil.createVisualNode(
- result, visualDocument);
- if (resultVisualNode.getNodeType() == Node.TEXT_NODE) {
- nsIDOMElement domElement = VisualDomUtil
- .createBorderlessContainer(visualDocument);
- domElement.appendChild(resultVisualNode);
- resultVisualNode = domElement;
- }
- return new VpeCreationData(resultVisualNode);
- } catch (Throwable th) {
- IceFacesActivator.getDefault().logError(th);
- }
- return VpeTemplateManager.getInstance().getDefTemplate().create(
- pageContext, sourceNode, visualDocument);
+ return VpeRendererUtil.createVisualEditorDate(pageContext, sourceNode, visualDocument, render, uiComponent);
}
}
Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceFacesOutputTextTemplate.java
===================================================================
--- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceFacesOutputTextTemplate.java 2010-05-17 08:53:42 UTC (rev 22112)
+++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceFacesOutputTextTemplate.java 2010-05-17 09:29:51 UTC (rev 22113)
@@ -12,18 +12,13 @@
import javax.faces.render.Renderer;
-import org.jboss.tools.jsf.vpe.icefaces.IceFacesActivator;
import org.jboss.tools.jsf.vpe.icefaces.utill.VpeRendererUtil;
import org.jboss.tools.jsf.vpe.template.mock.impl.VpeFacesContext;
import org.jboss.tools.jsf.vpe.template.mock.impl.VpeUIComponent;
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate;
import org.jboss.tools.vpe.editor.template.VpeCreationData;
-import org.jboss.tools.vpe.editor.template.VpeTemplateManager;
-import org.jboss.tools.vpe.editor.util.VisualDomUtil;
import org.mozilla.interfaces.nsIDOMDocument;
-import org.mozilla.interfaces.nsIDOMElement;
-import org.mozilla.interfaces.nsIDOMNode;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -36,26 +31,11 @@
public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
nsIDOMDocument visualDocument) {
- try {
VpeFacesContext.getInstance().setResponseWriter(null);
Renderer render = new com.icesoft.faces.renderkit.dom_html_basic.TextRenderer();
VpeUIComponent uiComponent = new VpeUIComponent(
(Element) sourceNode);
- Node result = VpeRendererUtil.processRenderer(render, uiComponent);
- nsIDOMNode resultVisualNode = VpeRendererUtil.createVisualNode(
- result, visualDocument);
- if (resultVisualNode.getNodeType() == Node.TEXT_NODE) {
- nsIDOMElement domElement = VisualDomUtil
- .createBorderlessContainer(visualDocument);
- domElement.appendChild(resultVisualNode);
- resultVisualNode = domElement;
- }
- return new VpeCreationData(resultVisualNode);
- } catch (Throwable th) {
- IceFacesActivator.getDefault().logError(th);
- }
- return VpeTemplateManager.getInstance().getDefTemplate().create(
- pageContext, sourceNode, visualDocument);
+ return VpeRendererUtil.createVisualEditorDate(pageContext, sourceNode, visualDocument, render, uiComponent);
}
}
Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceFacesSelectBooleanCheckboxTemplate.java
===================================================================
--- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceFacesSelectBooleanCheckboxTemplate.java 2010-05-17 08:53:42 UTC (rev 22112)
+++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceFacesSelectBooleanCheckboxTemplate.java 2010-05-17 09:29:51 UTC (rev 22113)
@@ -12,18 +12,13 @@
import javax.faces.render.Renderer;
-import org.jboss.tools.jsf.vpe.icefaces.IceFacesActivator;
import org.jboss.tools.jsf.vpe.icefaces.utill.VpeRendererUtil;
import org.jboss.tools.jsf.vpe.template.mock.impl.VpeFacesContext;
import org.jboss.tools.jsf.vpe.template.mock.impl.VpeUIComponent;
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate;
import org.jboss.tools.vpe.editor.template.VpeCreationData;
-import org.jboss.tools.vpe.editor.template.VpeTemplateManager;
-import org.jboss.tools.vpe.editor.util.VisualDomUtil;
import org.mozilla.interfaces.nsIDOMDocument;
-import org.mozilla.interfaces.nsIDOMElement;
-import org.mozilla.interfaces.nsIDOMNode;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -35,26 +30,11 @@
public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
nsIDOMDocument visualDocument) {
- try {
VpeFacesContext.getInstance().setResponseWriter(null);
Renderer render = new com.icesoft.faces.renderkit.dom_html_basic.CheckboxRenderer();
VpeUIComponent uiComponent = new VpeUIComponent(
(Element) sourceNode);
- Node result = VpeRendererUtil.processRenderer(render, uiComponent);
- nsIDOMNode resultVisualNode = VpeRendererUtil.createVisualNode(
- result, visualDocument);
- if (resultVisualNode.getNodeType() == Node.TEXT_NODE) {
- nsIDOMElement domElement = VisualDomUtil
- .createBorderlessContainer(visualDocument);
- domElement.appendChild(resultVisualNode);
- resultVisualNode = domElement;
- }
- return new VpeCreationData(resultVisualNode);
- } catch (Throwable th) {
- IceFacesActivator.getDefault().logError(th);
- }
- return VpeTemplateManager.getInstance().getDefTemplate().create(
- pageContext, sourceNode, visualDocument);
+ return VpeRendererUtil.createVisualEditorDate(pageContext, sourceNode, visualDocument, render, uiComponent);
}
}
Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceInputTextTemplate.java
===================================================================
--- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceInputTextTemplate.java 2010-05-17 08:53:42 UTC (rev 22112)
+++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceInputTextTemplate.java 2010-05-17 09:29:51 UTC (rev 22113)
@@ -12,18 +12,13 @@
import javax.faces.render.Renderer;
-import org.jboss.tools.jsf.vpe.icefaces.IceFacesActivator;
import org.jboss.tools.jsf.vpe.icefaces.utill.VpeRendererUtil;
import org.jboss.tools.jsf.vpe.template.mock.impl.VpeFacesContext;
import org.jboss.tools.jsf.vpe.template.mock.impl.VpeHtmlInputText;
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate;
import org.jboss.tools.vpe.editor.template.VpeCreationData;
-import org.jboss.tools.vpe.editor.template.VpeTemplateManager;
-import org.jboss.tools.vpe.editor.util.VisualDomUtil;
import org.mozilla.interfaces.nsIDOMDocument;
-import org.mozilla.interfaces.nsIDOMElement;
-import org.mozilla.interfaces.nsIDOMNode;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -35,26 +30,11 @@
public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
nsIDOMDocument visualDocument) {
- try {
VpeFacesContext.getInstance().setResponseWriter(null);
Renderer render = new com.icesoft.faces.component.ext.renderkit.InputTextRenderer();
VpeHtmlInputText uiComponent = new VpeHtmlInputText(
(Element) sourceNode);
- Node result = VpeRendererUtil.processRenderer(render, uiComponent);
- nsIDOMNode resultVisualNode = VpeRendererUtil.createVisualNode(
- result, visualDocument);
- if (resultVisualNode.getNodeType() == Node.TEXT_NODE) {
- nsIDOMElement domElement = VisualDomUtil
- .createBorderlessContainer(visualDocument);
- domElement.appendChild(resultVisualNode);
- resultVisualNode = domElement;
- }
- return new VpeCreationData(resultVisualNode);
- } catch (Throwable th) {
- IceFacesActivator.getDefault().logError(th);
- }
- return VpeTemplateManager.getInstance().getDefTemplate().create(
- pageContext, sourceNode, visualDocument);
+ return VpeRendererUtil.createVisualEditorDate(pageContext, sourceNode, visualDocument, render, uiComponent);
}
}
Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/utill/VpeRendererUtil.java
===================================================================
--- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/utill/VpeRendererUtil.java 2010-05-17 08:53:42 UTC (rev 22112)
+++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/utill/VpeRendererUtil.java 2010-05-17 09:29:51 UTC (rev 22113)
@@ -12,8 +12,13 @@
import javax.faces.component.UIComponent;
import javax.faces.render.Renderer;
+
import org.jboss.tools.jsf.vpe.icefaces.IceFacesActivator;
import org.jboss.tools.jsf.vpe.template.mock.impl.VpeFacesContext;
+import org.jboss.tools.vpe.editor.context.VpePageContext;
+import org.jboss.tools.vpe.editor.template.VpeCreationData;
+import org.jboss.tools.vpe.editor.template.VpeTemplateManager;
+import org.jboss.tools.vpe.editor.util.VisualDomUtil;
import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMElement;
import org.mozilla.interfaces.nsIDOMNode;
@@ -21,45 +26,77 @@
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+
import com.icesoft.faces.context.DOMContext;
/**
* Util class for calling real renderers and obtain information from them
*
* @author mareshkau
- *
+ *
*/
public class VpeRendererUtil {
-
-
- public static Node processRenderer(final Renderer render, final UIComponent uiComponent){
-
-
+
+ public static final VpeCreationData createVisualEditorDate(
+ VpePageContext pageContext, Node sourceNode,
+ nsIDOMDocument visualDocument, final Renderer render,
+ final UIComponent uiComponent) {
try {
+ // VpeFacesContext.getInstance().setResponseWriter(null);
+ // Renderer render = new
+ // com.icesoft.faces.renderkit.dom_html_basic.TextRenderer();
+ // VpeUIComponent uiComponent = new VpeUIComponent(
+ // (Element) sourceNode);
+ Node result = VpeRendererUtil.processRenderer(render, uiComponent);
+ nsIDOMNode resultVisualNode = VpeRendererUtil.createVisualNode(
+ result, visualDocument);
+ if (resultVisualNode.getNodeType() == Node.TEXT_NODE) {
+ nsIDOMElement domElement = VisualDomUtil
+ .createBorderlessContainer(visualDocument);
+ domElement.appendChild(resultVisualNode);
+ resultVisualNode = domElement;
+ }
+ return new VpeCreationData(resultVisualNode);
+ } catch (Throwable th) {
+ IceFacesActivator.getDefault().logError(th);
+ }
+ return VpeTemplateManager.getInstance().getDefTemplate().create(
+ pageContext, sourceNode, visualDocument);
+ }
+
+ private static Node processRenderer(final Renderer render,
+ final UIComponent uiComponent) {
+
+ try {
render.encodeBegin(VpeFacesContext.getInstance(), uiComponent);
render.encodeEnd(VpeFacesContext.getInstance(), uiComponent);
} catch (Throwable e) {
IceFacesActivator.getDefault().logError(e);
}
- DOMContext domContext = DOMContext.getDOMContext(VpeFacesContext.getInstance(), uiComponent);
- return domContext.getRootNode()!=null?domContext.getRootNode():domContext.getCursorParent().getFirstChild();
+ DOMContext domContext = DOMContext.getDOMContext(VpeFacesContext
+ .getInstance(), uiComponent);
+ return domContext.getRootNode() != null ? domContext.getRootNode()
+ : domContext.getCursorParent().getFirstChild();
}
-
- public static final nsIDOMNode createVisualNode(Node srcNode,nsIDOMDocument visualDocument){
-
+
+ private static final nsIDOMNode createVisualNode(Node srcNode,
+ nsIDOMDocument visualDocument) {
+
nsIDOMNode resultNode = null;
- switch(srcNode.getNodeType()) {
- case Node.TEXT_NODE:{
+ switch (srcNode.getNodeType()) {
+ case Node.TEXT_NODE: {
resultNode = visualDocument.createTextNode(srcNode.getNodeValue());
break;
}
- case Node.ELEMENT_NODE:{
+ case Node.ELEMENT_NODE: {
resultNode = visualDocument.createElement(srcNode.getNodeName());
- copyAttributes((Element)srcNode, (nsIDOMElement)resultNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID));
+ copyAttributes((Element) srcNode, (nsIDOMElement) resultNode
+ .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID));
NodeList chieldNodes = srcNode.getChildNodes();
- for(int i=0;i<chieldNodes.getLength();i++){
- nsIDOMNode chield = createVisualNode(chieldNodes.item(i), visualDocument);
- if(chield!=null) {
+ for (int i = 0; i < chieldNodes.getLength(); i++) {
+ nsIDOMNode chield = createVisualNode(chieldNodes.item(i),
+ visualDocument);
+ if (chield != null) {
resultNode.appendChild(chield);
}
}
@@ -67,13 +104,14 @@
}
return resultNode;
}
-
- private static final void copyAttributes(Element srcElement, nsIDOMElement visualElement) {
+
+ private static final void copyAttributes(Element srcElement,
+ nsIDOMElement visualElement) {
NamedNodeMap attributeMap = srcElement.getAttributes();
- for(int i=0; i< attributeMap.getLength();i++){
+ for (int i = 0; i < attributeMap.getLength(); i++) {
Node attr = attributeMap.item(i);
visualElement.setAttribute(attr.getNodeName(), attr.getNodeValue());
}
}
-
+
}
15 years, 11 months
- 1
- 0
JBoss Tools SVN: r22112 - trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2010-05-17 04:53:42 -0400 (Mon, 17 May 2010)
New Revision: 22112
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java
Log:
https://jira.jboss.org/browse/JBIDE-5833
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java 2010-05-17 08:29:53 UTC (rev 22111)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java 2010-05-17 08:53:42 UTC (rev 22112)
@@ -78,22 +78,22 @@
structure.addTextChange(change);
list.add(structure);
- renameComponent(seamEjbProject, "test", "best", list, false);
+ renameComponent(seamEjbProject, "test", "best", list, 0);
}
-// public void testRemaningMailSessionDeclarationInComponentsXml_JBIDE4447() throws CoreException {
-// ArrayList<TestChangeStructure> list = new ArrayList<TestChangeStructure>();
-//
-// TestChangeStructure structure = new TestChangeStructure(warProject, "/WebContent/WEB-INF/components.xml");
-// TestTextChange change = new TestTextChange(2345, 41, "name=\"org.jboss.seam.mail.newMailSession\"");
-// structure.addTextChange(change);
-//
-// list.add(structure);
-//
-// renameComponent(seamWarProject, "org.jboss.seam.mail.mailSession", "org.jboss.seam.mail.newMailSession", list, true);
-// }
+ public void testRemaningMailSessionDeclarationInComponentsXml_JBIDE4447() throws CoreException {
+ ArrayList<TestChangeStructure> list = new ArrayList<TestChangeStructure>();
- private void renameComponent(ISeamProject seamProject, String componentName, String newName, List<TestChangeStructure> changeList, boolean fromJar) throws CoreException{
+ TestChangeStructure structure = new TestChangeStructure(warProject, "/WebContent/WEB-INF/components.xml");
+ TestTextChange change = new TestTextChange(2345, 41, "name=\"org.jboss.seam.mail.newMailSession\"");
+ structure.addTextChange(change);
+
+ list.add(structure);
+
+ renameComponent(seamWarProject, "org.jboss.seam.mail.mailSession", "org.jboss.seam.mail.newMailSession", list, 8000);
+ }
+
+ private void renameComponent(ISeamProject seamProject, String componentName, String newName, List<TestChangeStructure> changeList, long delay) throws CoreException{
JobUtils.waitForIdle();
// Test before renaming
@@ -123,10 +123,13 @@
}
rootChange.perform(new NullProgressMonitor());
- JobUtils.waitForIdle();
+
+ if(delay > 0)
+ JobUtils.waitForIdle(delay);
+ else
+ JobUtils.waitForIdle();
+
// Test results
- //if(!fromJar)
- //assertNull("There is unexpected component in seam project: " + componentName, seamProject.getComponent(componentName));
assertNotNull("Can't load component " + newName, seamProject.getComponent(newName));
for(TestChangeStructure changeStructure : changeList){
IFile file = changeStructure.getProject().getFile(changeStructure.getFileName());
15 years, 11 months
- 1
- 0
JBoss Tools SVN: r22111 - in workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe: icefaces/utill and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2010-05-17 04:29:53 -0400 (Mon, 17 May 2010)
New Revision: 22111
Added:
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/template/mock/impl/VpeHtmlInputText.java
Modified:
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceInputTextTemplate.java
workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/utill/VpeRendererUtil.java
Log:
https://jira.jboss.org/browse/JBIDE-4710, processing for ice input text rendering has been added
Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceInputTextTemplate.java
===================================================================
--- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceInputTextTemplate.java 2010-05-17 04:15:28 UTC (rev 22110)
+++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/template/IceInputTextTemplate.java 2010-05-17 08:29:53 UTC (rev 22111)
@@ -15,8 +15,7 @@
import org.jboss.tools.jsf.vpe.icefaces.IceFacesActivator;
import org.jboss.tools.jsf.vpe.icefaces.utill.VpeRendererUtil;
import org.jboss.tools.jsf.vpe.template.mock.impl.VpeFacesContext;
-import org.jboss.tools.jsf.vpe.template.mock.impl.VpeUICommand;
-import org.jboss.tools.jsf.vpe.template.mock.impl.VpeUIComponent;
+import org.jboss.tools.jsf.vpe.template.mock.impl.VpeHtmlInputText;
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate;
import org.jboss.tools.vpe.editor.template.VpeCreationData;
@@ -39,7 +38,7 @@
try {
VpeFacesContext.getInstance().setResponseWriter(null);
Renderer render = new com.icesoft.faces.component.ext.renderkit.InputTextRenderer();
- VpeUICommand uiComponent = new VpeUICommand(
+ VpeHtmlInputText uiComponent = new VpeHtmlInputText(
(Element) sourceNode);
Node result = VpeRendererUtil.processRenderer(render, uiComponent);
nsIDOMNode resultVisualNode = VpeRendererUtil.createVisualNode(
Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/utill/VpeRendererUtil.java
===================================================================
--- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/utill/VpeRendererUtil.java 2010-05-17 04:15:28 UTC (rev 22110)
+++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces/utill/VpeRendererUtil.java 2010-05-17 08:29:53 UTC (rev 22111)
@@ -42,7 +42,7 @@
IceFacesActivator.getDefault().logError(e);
}
DOMContext domContext = DOMContext.getDOMContext(VpeFacesContext.getInstance(), uiComponent);
- return domContext.getRootNode();
+ return domContext.getRootNode()!=null?domContext.getRootNode():domContext.getCursorParent().getFirstChild();
}
public static final nsIDOMNode createVisualNode(Node srcNode,nsIDOMDocument visualDocument){
Added: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/template/mock/impl/VpeHtmlInputText.java
===================================================================
--- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/template/mock/impl/VpeHtmlInputText.java (rev 0)
+++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/template/mock/impl/VpeHtmlInputText.java 2010-05-17 08:29:53 UTC (rev 22111)
@@ -0,0 +1,134 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jsf.vpe.template.mock.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.el.ELContext;
+import javax.el.ELException;
+import javax.el.PropertyNotFoundException;
+import javax.el.PropertyNotWritableException;
+import javax.el.ValueExpression;
+
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.icesoft.faces.component.ext.HtmlInputText;
+
+/**
+ * @author mareshkau
+ *
+ */
+public class VpeHtmlInputText extends HtmlInputText {
+ private Map attributesMap;
+
+ public VpeHtmlInputText(Element sourceElement) {
+ attributesMap = new HashMap();
+ NamedNodeMap attributes = sourceElement.getAttributes();
+ for(int i=0;i<attributes.getLength();i++){
+ Node item = attributes.item(i);
+ attributesMap.put(item.getNodeName(), item.getNodeValue());
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see javax.faces.component.UIComponentBase#getRendererType()
+ */
+ @Override
+ public String getRendererType() {
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see javax.faces.component.UIComponent#getAttributes()
+ */
+ @Override
+ public Map getAttributes() {
+ return attributesMap;
+ }
+
+ /* (non-Javadoc)
+ * @see javax.faces.component.UIComponent#getValueExpression(java.lang.String)
+ */
+ @Override
+ public ValueExpression getValueExpression(final String name) {
+ return new ValueExpression(){
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 4723033247685328768L;
+
+ @Override
+ public Class<?> getExpectedType() {
+ // TODO Auto-generated method stub
+ return String.class;
+ }
+
+ @Override
+ public Class<?> getType(ELContext arg0)
+ throws NullPointerException, PropertyNotFoundException,
+ ELException {
+ // TODO Auto-generated method stub
+ return String.class;
+ }
+
+ @Override
+ public Object getValue(ELContext arg0) throws NullPointerException,
+ PropertyNotFoundException, ELException {
+ return getAttributes().get(name);
+ }
+
+ @Override
+ public boolean isReadOnly(ELContext arg0)
+ throws NullPointerException, PropertyNotFoundException,
+ ELException {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public void setValue(ELContext arg0, Object arg1)
+ throws NullPointerException, PropertyNotFoundException,
+ PropertyNotWritableException, ELException {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public boolean equals(Object arg0) {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public String getExpressionString() {
+ // TODO Auto-generated method stub
+ return (String) getAttributes().get(name);
+ }
+
+ @Override
+ public int hashCode() {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ @Override
+ public boolean isLiteralText() {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ };
+ }
+}
15 years, 11 months
- 1
- 0
JBoss Tools SVN: r22110 - in trunk/bpel/plugins/org.eclipse.bpel.ui: src/org/eclipse/bpel/ui/wizards and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2010-05-17 00:15:28 -0400 (Mon, 17 May 2010)
New Revision: 22110
Added:
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/WSDLCustomPage.java
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/WSDLServiceDetail.java
Modified:
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Templates.java
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/Messages.java
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizard.java
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizardPage1.java
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizardPage2.java
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/messages.properties
trunk/bpel/plugins/org.eclipse.bpel.ui/templates/async/sample.bpel
trunk/bpel/plugins/org.eclipse.bpel.ui/templates/async/sample.wsdl
trunk/bpel/plugins/org.eclipse.bpel.ui/templates/sync/sample.bpel
trunk/bpel/plugins/org.eclipse.bpel.ui/templates/sync/sample.wsdl
Log:
JBIDE-6154: to trunk
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Templates.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Templates.java 2010-05-17 01:14:13 UTC (rev 22109)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Templates.java 2010-05-17 04:15:28 UTC (rev 22110)
@@ -10,7 +10,6 @@
* Oracle Corporation
*******************************************************************************/
-
package org.eclipse.bpel.ui;
import java.io.IOException;
@@ -28,332 +27,330 @@
import java.util.TreeMap;
import java.util.TreeSet;
+import org.eclipse.bpel.ui.wizards.WSDLServiceDetail;
import org.osgi.framework.Bundle;
/**
- * You can think of BPEL templates as a 1 dimensional list of stencils that are used
- * to create an initial BPEL process.
+ * You can think of BPEL templates as a 1 dimensional list of stencils that are
+ * used to create an initial BPEL process.
* <p>
- * Each template for a process may contain just 1 resource - just the template for
- * the BPEL process itself. But it may also contain other resources which are useful
- * in creating that particular process from that particular template.
- * Simply put, a template may have 1-N template resources that need to be created
- * as a result of creating what appears to be a single process file.
- *
+ * Each template for a process may contain just 1 resource - just the template
+ * for the BPEL process itself. But it may also contain other resources which
+ * are useful in creating that particular process from that particular template.
+ * Simply put, a template may have 1-N template resources that need to be
+ * created as a result of creating what appears to be a single process file.
+ *
* @author Michal Chmielewski (michal.chmielewski(a)oracle.com)
*/
public class Templates {
/** this file defines the properties for a particular template */
- static final String TEMPLATE_PROPERTIES = "template.properties"; //$NON-NLS-1$
-
- /** location within the bundle where we look for templates */
- static final String TEMPLATE_LOCATION = "/templates/"; //$NON-NLS-1$
-
+ static final String TEMPLATE_PROPERTIES = "template.properties"; //$NON-NLS-1$
+
+ /** location within the bundle where we look for templates */
+ static final String TEMPLATE_LOCATION = "/templates/"; //$NON-NLS-1$
+
/** default template file encoding, for a given set of template resources */
- static final String DEFAULT_ENCODING = "UTF-8"; //$NON-NLS-1$
-
+ static final String DEFAULT_ENCODING = "UTF-8"; //$NON-NLS-1$
+
/** the main bpel file has this extension */
- @Deprecated // use content type instead of bpel file extensions
- static final String BPEL_FILE_EXTENSION = ".bpel"; //$NON-NLS-1$
-
+ @Deprecated
+ // use content type instead of bpel file extensions
+ static final String BPEL_FILE_EXTENSION = ".bpel"; //$NON-NLS-1$
+
/** Entries which are directories of the bundle */
static final String BUNDLE_DIRECTORY = "/"; //$NON-NLS-1$
-
+
/** Key or property under which the name of the template is present */
- static final String PROPERTY_NAME = "name"; //$NON-NLS-1$
-
+ static final String PROPERTY_NAME = "name"; //$NON-NLS-1$
+
/** The key name of the template */
static final String PROPERTY_KEY = "key"; //$NON-NLS-1$
-
- /** Key or property under which the encoding information for the template resources is present */
+
+ /**
+ * Key or property under which the encoding information for the template
+ * resources is present
+ */
static final String PROPERTY_ENCODING = "encoding"; //$NON-NLS-1$
/** Key or property under which the description of the template is present */
static final String PROPERTY_DESCRIPTION = "description"; //$NON-NLS-1$
-
+
/** avoid empty string */
static final String EMPTY = ""; //$NON-NLS-1$
-
+
static final String[] EMPTY_NAMES = {};
-
+
/** Templates contribute namespaces to the new file wizard */
Set<String> mNamespaceNames = new TreeSet<String>();
-
- /** Templates indexed by name, sorted by name, according to the natural ordering */
- Map<String,Template> mTemplateByName = new TreeMap<String,Template>();
+ /**
+ * Templates indexed by name, sorted by name, according to the natural
+ * ordering
+ */
+ Map<String, Template> mTemplateByName = new TreeMap<String, Template>();
+
/** Templates indexed by id, sorted by name */
- Map<String,Template> mTemplateByKey = new HashMap<String,Template>();
+ Map<String, Template> mTemplateByKey = new HashMap<String, Template>();
-
/**
- * Initialize the template information from the bundle passed.
- * This is typically the bundle of the plugin.
- *
- * @author Michal Chmielewski (michal.chmielewski(a)oracle.com)
- * @param bundle the bundle where the template information ought to be looked for
+ * Initialize the template information from the bundle passed. This is
+ * typically the bundle of the plugin.
+ *
+ * @author Michal Chmielewski (michal.chmielewski(a)oracle.com)
+ * @param bundle
+ * the bundle where the template information ought to be looked
+ * for
*/
-
+
@SuppressWarnings("nls")
- public void initializeFrom ( Bundle bundle )
- {
+ public void initializeFrom(Bundle bundle) {
initializeFrom(bundle, TEMPLATE_LOCATION);
}
-
+
/**
* @param templateLocation
*/
-
- public void initializeFrom ( String templateLocation ) {
+
+ public void initializeFrom(String templateLocation) {
initializeFrom(BPELUIPlugin.INSTANCE.getBundle(), templateLocation);
}
-
+
/**
* @param bundle
* @param templateLocation
*/
-
- @SuppressWarnings({ "nls", "boxing" })
- public void initializeFrom (Bundle bundle, String templateLocation ) {
-
- Enumeration<String> list = bundle.getEntryPaths( templateLocation );
+
+ @SuppressWarnings( { "nls", "boxing", "unchecked" })
+ public void initializeFrom(Bundle bundle, String templateLocation) {
+
+ Enumeration<String> list = bundle.getEntryPaths(templateLocation);
if (list == null) {
- return ;
+ return;
}
// got some elements, look for "template.properties"
-
+
int count = 0;
-
+
while (list.hasMoreElements()) {
String nextRoot = list.nextElement();
- if ( nextRoot.endsWith(BUNDLE_DIRECTORY) == false ) {
+ if (nextRoot.endsWith(BUNDLE_DIRECTORY) == false) {
continue;
}
-
+
String nextEntry = nextRoot + TEMPLATE_PROPERTIES;
// found another template
-
+
URL nextURL = bundle.getEntry(nextEntry);
if (nextURL == null) {
// no such thing
continue;
}
-
+
// looks like we have properties
count += 1;
-
- Properties props = new Properties ();
+
+ Properties props = new Properties();
InputStream is = null;
-
+
try {
is = nextURL.openStream();
- props.load( is );
+ props.load(is);
} catch (IOException e) {
BPELUIPlugin.log(e);
-
-
+
// skip to the next entry
continue;
-
+
} finally {
- try { is.close() ; } catch (Throwable t) {}
+ try {
+ is.close();
+ } catch (Throwable t) {
+ }
}
-
-
+
String name = props.getProperty(PROPERTY_NAME);
-
+
// No name, no game.
if (name == null) {
- continue ;
+ continue;
}
-
-
- String enc = props.getProperty(PROPERTY_ENCODING,DEFAULT_ENCODING);
- String desc = props.getProperty(PROPERTY_DESCRIPTION,EMPTY);
-
-
+
+ String enc = props.getProperty(PROPERTY_ENCODING, DEFAULT_ENCODING);
+ String desc = props.getProperty(PROPERTY_DESCRIPTION, EMPTY);
+
// add any namespaces we are supplying ...
- mNamespaceNames.addAll( findProperties (props,"namespace.{0}") );
-
+ mNamespaceNames.addAll(findProperties(props, "namespace.{0}"));
+
Template template = new Template();
template.mName = name;
template.mDescription = desc;
template.mProperties = (Map) props;
-
- mTemplateByName.put ( name, template );
- String id = props.getProperty(PROPERTY_KEY);
+
+ mTemplateByName.put(name, template);
+ String id = props.getProperty(PROPERTY_KEY);
if (id != null) {
- mTemplateByKey.put ( id, template );
+ mTemplateByKey.put(id, template);
}
-
-
+
int hole = 3;
- for(int i=0; hole >= 0; i++) {
- String key = MessageFormat.format("resource.{0}",i);
+ for (int i = 0; hole >= 0; i++) {
+ String key = MessageFormat.format("resource.{0}", i);
String resourceName = props.getProperty(key);
if (resourceName == null) {
hole--;
continue;
}
hole = 3;
-
+
key = MessageFormat.format("resource.{0}.name", i);
String nameTemplate = props.getProperty(key);
-
+
String entryLoc = nextRoot + resourceName;
-
- TemplateResource resource = new TemplateResource() ;
+
+ TemplateResource resource = new TemplateResource();
resource.mName = resourceName;
- resource.mContent = slurpContent ( bundle.getEntry(entryLoc), enc );
- resource.mNameTemplate = nameTemplate ;
-
- // add the resource which makes up this "template"
- template.add ( resource );
-
+ resource.mContent = slurpContent(bundle.getEntry(entryLoc), enc);
+ resource.mNameTemplate = nameTemplate;
+
+ // add the resource which makes up this "template"
+ template.add(resource);
+
}
-
+
}
-
+
}
-
-
+
/**
* Slurp the resource into memory and return as a String. If an exception
* occurs, it is logged, and the return value is empty string.
*
- * @param loc the location from which we should slurp ...
- * @param enc the encoding to use
- * @return the text
+ * @param loc
+ * the location from which we should slurp ...
+ * @param enc
+ * the encoding to use
+ * @return the text
*/
-
- String slurpContent ( URL loc, String enc) {
-
+
+ String slurpContent(URL loc, String enc) {
+
if (loc == null) {
return null;
}
-
- StringBuilder sb = new StringBuilder ( 2 * 1048 );
- char[] buf = new char[ 256 ];
+
+ StringBuilder sb = new StringBuilder(2 * 1048);
+ char[] buf = new char[256];
InputStreamReader isr = null;
-
+
try {
- isr = new InputStreamReader ( loc.openStream(), enc);
-
+ isr = new InputStreamReader(loc.openStream(), enc);
+
do {
int cnt = isr.read(buf);
if (cnt < 0) {
break;
}
- sb.append( buf, 0, cnt );
+ sb.append(buf, 0, cnt);
} while (true);
-
+
} catch (Exception ex) {
BPELUIPlugin.log(ex);
} finally {
- try {isr.close(); } catch (Throwable t) {}
+ try {
+ isr.close();
+ } catch (Throwable t) {
+ }
}
-
-
- return sb.toString();
+
+ return sb.toString();
}
-
-
-
-
- List<String> findProperties ( Properties props, String pattern ) {
-
+
+ List<String> findProperties(Properties props, String pattern) {
+
List<String> list = new ArrayList<String>();
int hole = 3;
-
- for(int i=0; hole >= 0; i++) {
-
- String key = MessageFormat.format(pattern, new Object[] { new Integer(i) } );
- String val = props.getProperty(key,null);
+
+ for (int i = 0; hole >= 0; i++) {
+
+ String key = MessageFormat.format(pattern,
+ new Object[] { new Integer(i) });
+ String val = props.getProperty(key, null);
if (val != null) {
- list.add ( val );
+ list.add(val);
hole = 3;
} else {
hole--;
}
}
-
+
return list;
}
-
+
/**
* @param key
* @return the template whose key is key
*/
-
- public Template getTemplateByKey ( String key ) {
+
+ public Template getTemplateByKey(String key) {
return mTemplateByKey.get(key);
}
-
-
- /**
- * Return the template definition (which includes other resources that
- * may be present) to the caller.
+
+ /**
+ * Return the template definition (which includes other resources that may
+ * be present) to the caller.
*
- * @param name name of the template
+ * @param name
+ * name of the template
* @return the template definition, including template resources
*/
-
- public Template getTemplateByName ( String name )
- {
+
+ public Template getTemplateByName(String name) {
return mTemplateByName.get(name);
}
-
-
- /**
- *
- * @return Return the namespaces contributed by the templates.
+
+ /**
+ *
+ * @return Return the namespaces contributed by the templates.
*/
-
- public String[] getNamespaceNames ()
- {
- return mNamespaceNames.toArray( EMPTY_NAMES );
+
+ public String[] getNamespaceNames() {
+ return mNamespaceNames.toArray(EMPTY_NAMES);
}
-
-
-
+
/**
* Return the template names that have been discovered.
*
* @return Return the template names.
*/
-
- public String [] getTemplateNames ()
- {
- return mTemplateByName.keySet().toArray( EMPTY_NAMES );
+
+ public String[] getTemplateNames() {
+ return mTemplateByName.keySet().toArray(EMPTY_NAMES);
}
-
-
-
+
/**
- * A given "BPEL Process" Template has a name, description, and
- * a list of resources (file templates) that will be used to create the initial
+ * A given "BPEL Process" Template has a name, description, and a list of
+ * resources (file templates) that will be used to create the initial
* process source file.
*
- * @author Michal Chmielewski (michal.chmielewski(a)oracle.com)
- *
+ * @author Michal Chmielewski (michal.chmielewski(a)oracle.com)
+ *
*/
-
+
public class Template {
-
+
/** Name of the process template */
String mName;
-
+
/** Description of this process template */
- String mDescription ;
-
- Map<String,String> mProperties ;
-
- /** list of resources that this template has (1-N) */
+ String mDescription;
+
+ Map<String, String> mProperties;
+
+ /** list of resources that this template has (1-N) */
List<TemplateResource> mResources = new ArrayList<TemplateResource>();
-
/**
* @return the name
*/
@@ -361,12 +358,11 @@
return mName;
}
-
- void add ( TemplateResource resource ) {
+ void add(TemplateResource resource) {
mResources.add(resource);
resource.mTemplate = this;
}
-
+
/**
* @return the template resources
*/
@@ -379,20 +375,20 @@
*/
public String getDescription() {
return mDescription;
- }
-
+ }
+
/**
* Return the property under the key or null if not found.
+ *
* @param key
* @return the property under the key, or null.
*/
-
- public String getProperty ( String key ) {
+
+ public String getProperty(String key) {
return mProperties.get(key);
}
-
- TemplateResource lookupResource ( String name ) {
+ TemplateResource lookupResource(String name) {
String name2 = mProperties.get(name);
for (TemplateResource resource : mResources) {
if (name.equals(resource.mName)) {
@@ -404,104 +400,125 @@
}
return null;
}
-
+
}
-
+
/**
- * A template resource is the actual file which will be used to create
- * the source file or other auxiliary files for the BPEL process source.
+ * A template resource is the actual file which will be used to create the
+ * source file or other auxiliary files for the BPEL process source.
*
* @author Michal Chmielewski, (michal.chmielewski(a)oracle.com)
*
*/
-
+
public class TemplateResource {
-
+
/** The template I belong to */
Template mTemplate = null;
-
+
/** Name of the resource (from the bundle) */
- String mName ;
-
+ String mName;
+
/** The content of the resource (slurped from the bundle) */
String mContent;
- /** The name template, that is, the file name template if depended on process name */
+ /**
+ * The name template, that is, the file name template if depended on
+ * process name
+ */
String mNameTemplate;
-
+
/**
* @return the content
*/
public String getContent() {
return mContent;
}
-
+
/**
* @return the name
*/
public String getName() {
return mName;
}
-
-
+
/**
* Process the content of the template and replace anything within
* ${...} by the corresponding key prent in the map passed.
*
- * @param args the keys that will be replaced in the content
+ * @param args
+ * the keys that will be replaced in the content
* @return the replaced content
*/
-
- public String process ( Map<String,Object> args ) {
-
- return process ( mContent, args );
+
+ public String process(Map<String, Object> args) {
+
+ return process(mContent, args);
}
-
-
+
/**
* Process the content of the template and replace anything within
* ${...} by the corresponding key present in the map passed.
*
- * @param args the keys that will be replaced in the content
+ * @param args
+ * the keys that will be replaced in the content
* @return the replaced content
*/
-
+
@SuppressWarnings("nls")
- String process (String src, Map<String,Object> args )
- {
+ String process(String src, Map<String, Object> args) {
// empty content, empty result
if (src == null) {
return "";
}
- StringBuilder sb = new StringBuilder ( src.length() );
- int cursor = 0;
+
+ // add the service and binding content
+ int start = src.indexOf("</definitions>");
+ if (start > 0) {
+ StringBuffer ss = new StringBuffer(src.substring(0, start));
+ if ("Asynchronous BPEL Process".equals(args.get("type"))) {
+ if ("soap".equals(args.get("protocol"))) {
+ ss.append(WSDLServiceDetail.Async_SOAPDetail);
+ } else {
+ ss.append(WSDLServiceDetail.Async_HTTPDetail);
+ }
+ } else if ("Synchronous BPEL Process".equals(args.get("type"))) {
+ if ("soap".equals(args.get("protocol"))) {
+ ss.append(WSDLServiceDetail.Sync_SOAPDetail);
+ } else {
+ ss.append(WSDLServiceDetail.Sync_HTTPDetail);
+ }
+ }
+ ss.append("</definitions>");
+ src = ss.toString();
+ }
+ StringBuilder sb = new StringBuilder(src.length());
+ int cursor = 0;
do {
- int openReplace = src.indexOf("${", cursor);
+ int openReplace = src.indexOf("${", cursor);
if (openReplace < 0) {
break;
}
- sb.append( src.substring(cursor,openReplace));
+ sb.append(src.substring(cursor, openReplace));
cursor = openReplace + 2;
- int closeReplace = src.indexOf("}",cursor);
- if (closeReplace < 0) {
+ int closeReplace = src.indexOf("}", cursor);
+ if (closeReplace < 0) {
return sb.toString();
}
-
- String expr = src.substring(cursor, closeReplace).trim() ;
- sb.append( lookup(expr,args) );
-
+
+ String expr = src.substring(cursor, closeReplace).trim();
+ sb.append(lookup(expr, args));
+
cursor = closeReplace + 1;
} while (true);
-
+
// the last segment
- sb.append( src.substring(cursor) );
+ sb.append(src.substring(cursor));
return sb.toString();
}
-
@SuppressWarnings("nls")
-
- Object lookup ( String key, Map<String,Object> args) {
+ Object lookup(String key, Map<String, Object> args) {
Object value = null;
TemplateResource r = null;
if (key.startsWith(":include:")) {
@@ -512,46 +529,45 @@
}
} else if (key.startsWith(":parse:")) {
key = key.substring(7);
- r = mTemplate.lookupResource (key);
+ r = mTemplate.lookupResource(key);
/** Avoid recursion at this point */
if (r != null && r != this) {
- value = r.process( args );
+ value = r.process(args);
}
- } else {
+ } else {
value = args.get(key);
if (value == null) {
value = mTemplate.mProperties.get(key);
- }
+ }
}
return value;
}
-
+
/**
- * Return the name of the resource
+ * Return the name of the resource
*
- * @param args map of arguments that are used in replacing
+ * @param args
+ * map of arguments that are used in replacing
* @return the name of the resource, after token replacement.
*/
-
- public String getName (Map<String,Object> args) {
-
+
+ public String getName(Map<String, Object> args) {
+
if (mNameTemplate == null) {
return mName;
- }
- return process (mNameTemplate, args);
+ }
+ return process(mNameTemplate, args);
}
-
-
+
/**
- * Ask if this TemplateResource is specifically a BPEL source file.
+ * Ask if this TemplateResource is specifically a BPEL source file.
*
- * @return Answer true if the extension is .bpel
+ * @return Answer true if the extension is .bpel
*/
-
- public boolean isProcess()
- {
- return mName.endsWith( BPEL_FILE_EXTENSION );
- }
+
+ public boolean isProcess() {
+ return mName.endsWith(BPEL_FILE_EXTENSION);
+ }
}
-
+
}
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/Messages.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/Messages.java 2010-05-17 01:14:13 UTC (rev 22109)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/Messages.java 2010-05-17 04:15:28 UTC (rev 22110)
@@ -53,4 +53,19 @@
public static String NewFileWizardPage2_0;
public static String NewFileWizardPage2_1;
public static String NewFileWizardPage2_2;
+ public static String NewFileWizardPage2_3;
+ public static String NewFileWizardPage1_Name;
+ public static String NewFileWizardPage2_Name;
+ public static String NewFileWizard_WSDLCustomPage_Name;
+ public static String NewFileWizard_WSDLCustomPage_Title;
+ public static String NewFileWizard_WSDLCustomPage_Description;
+ public static String NewFileWizard_WSDLCustomPage_ServiceLable;
+ public static String NewFileWizard_WSDLCustomPage_PortLabel;
+ public static String NewFileWizard_WSDLCustomPage_AddressLabel;
+ public static String NewFileWizard_WSDLCustomPage_WSDLGroup;
+ public static String NewFileWizard_WSDLCustomPage_BindingLabel;
+
+ public static String Error_NewFileWizard_WSDLCustomPage_Name_Empty;
+ public static String Error_NewFileWizard_WSDLCustomPage_Name_Space;
+ public static String Error_NewFileWizard_WSDLCustomPage_Protocol;
}
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizard.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizard.java 2010-05-17 01:14:13 UTC (rev 22109)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizard.java 2010-05-17 04:15:28 UTC (rev 22110)
@@ -10,10 +10,10 @@
* Oracle Corporation
*******************************************************************************/
-
package org.eclipse.bpel.ui.wizards;
import java.lang.reflect.InvocationTargetException;
+import java.util.Map;
import org.eclipse.bpel.ui.BPELUIPlugin;
import org.eclipse.core.resources.IContainer;
@@ -31,41 +31,43 @@
import org.eclipse.ui.ide.IDE;
import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;
-
/**
- * Wizard for the new process template.
- *
- * @author Michal Chmielewski (michal.chmielewski(a)oracle.com)
- *
+ * Wizard for the new process template.
+ *
+ * @author Michal Chmielewski (michal.chmielewski(a)oracle.com)
+ *
*/
public class NewFileWizard extends Wizard implements INewWizard {
/** The id of our BPEL editor */
static protected final String BPEL_EDITOR_ID = "org.eclipse.bpel.ui.bpeleditor"; //$NON-NLS-1$
-
+
/** The container where the file(s) will be created */
- private IContainer mContainer ;
-
+ private IContainer mContainer;
+
private IWorkbench fWorkbench;
-
+
/** The 1st page of the wizard */
private NewFileWizardPage1 fMainPage;
/** The 2nd page of the wizard */
private NewFileWizardPage2 fContainerPage;
-
+ /** The 3nd page of the wizard */
+ private WSDLCustomPage wsdlPage;
+
/**
* Create a brand new shining Create Project Wizard for BPEL.
*/
public NewFileWizard() {
-
+
setNeedsProgressMonitor(true);
- setDialogSettings(BPELUIPlugin.INSTANCE.getDialogSettingsFor(this));
+ setDialogSettings(BPELUIPlugin.INSTANCE.getDialogSettingsFor(this));
setHelpAvailable(false);
-
+ this.setWindowTitle(Messages.NewFileWizard_1);
+
}
/**
@@ -83,15 +85,14 @@
public void init(IWorkbench workbench, IStructuredSelection currentSelection) {
fWorkbench = workbench;
- mContainer = getBPELContainer( currentSelection.getFirstElement() );
+ mContainer = getBPELContainer(currentSelection.getFirstElement());
}
-
protected void selectAndReveal(IResource newResource) {
- BasicNewResourceWizard.selectAndReveal(newResource, fWorkbench.getActiveWorkbenchWindow());
+ BasicNewResourceWizard.selectAndReveal(newResource, fWorkbench
+ .getActiveWorkbenchWindow());
}
-
protected void openResource(final IFile resource) {
if (resource.getType() != IResource.FILE) {
return;
@@ -107,9 +108,10 @@
final Display display = getShell().getDisplay();
display.asyncExec(new Runnable() {
public void run() {
- try {
- IDE.openEditor(activePage, resource, BPEL_EDITOR_ID, true);
- // IDE.openEditor(activePage, resource, true);
+ try {
+ IDE.openEditor(activePage, resource, BPEL_EDITOR_ID,
+ true);
+ // IDE.openEditor(activePage, resource, true);
} catch (PartInitException e) {
BPELUIPlugin.log(e);
}
@@ -120,7 +122,6 @@
}
}
-
/**
* Perform cancel. Close the wizard and don't do anything else.
*
@@ -138,14 +139,18 @@
@Override
public void addPages() {
-
- fMainPage = new NewFileWizardPage1(Messages.NewFileWizard_1);
- fContainerPage = new NewFileWizardPage2(Messages.NewFileWizard_1);
-
+
+ fMainPage = new NewFileWizardPage1(Messages.NewFileWizardPage1_Name);
+ fContainerPage = new NewFileWizardPage2(
+ Messages.NewFileWizardPage2_Name);
+ wsdlPage = new WSDLCustomPage(
+ Messages.NewFileWizard_WSDLCustomPage_Name);
+
addPage(fMainPage);
+ addPage(wsdlPage);
addPage(fContainerPage);
-
- fContainerPage.setPreviousPage( fMainPage );
+ wsdlPage.setPreviousPage(fMainPage);
+ fContainerPage.setPreviousPage(wsdlPage);
}
/**
@@ -160,21 +165,24 @@
public boolean performFinish() {
BPELCreateOperation runnable = new BPELCreateOperation();
-
+
// The container either comes from the 2nd page, explicitely defined
// or it comes as the context in the current selection.
-
+
IContainer container = fContainerPage.getResourceContainer();
if (container == null) {
container = mContainer;
}
+
+ runnable.setContainer(container);
+ runnable.setTemplate(fMainPage.getSelectedTemplate());
- runnable.setContainer( container );
- runnable.setTemplate( fMainPage.getSelectedTemplate () );
- runnable.setArgs( fMainPage.getArgs () ) ;
-
+ Map<String, Object> map = fMainPage.getArgs();
+ map.putAll(wsdlPage.getMap());
+ runnable.setArgs(map);
+
try {
- getContainer().run(false, true, runnable);
+ getContainer().run(false, true, runnable);
} catch (InvocationTargetException e) {
BPELUIPlugin.log(e);
return false;
@@ -184,22 +192,21 @@
}
IFile res = (IFile) runnable.getElementToOpen();
- if (res != null) {
+ if (res != null && res.exists()) {
openResource(res);
}
return true;
}
-
/**
- * Return the BPEL files container in which we can generate
- * process from the template.
+ * Return the BPEL files container in which we can generate process from the
+ * template.
*
* @return the BPEL files IContainer
*/
-
- IContainer getBPELContainer ( Object obj ) {
-
+
+ IContainer getBPELContainer(Object obj) {
+
if (obj == null) {
return null;
}
@@ -209,7 +216,7 @@
project = file.getProject();
}
if (obj instanceof IContainer) {
- IContainer container = (IContainer)obj;
+ IContainer container = (IContainer) obj;
project = container.getProject();
}
if (project != null) {
@@ -218,19 +225,18 @@
return bpelContent;
}
}
- return null;
+ return null;
}
-
/**
- *
+ *
* Final condition for the wizard to finish
*/
-
+
@Override
public boolean canFinish() {
- return (fMainPage.isPageComplete() && mContainer != null) || super.canFinish();
+ return (fMainPage.isPageComplete() && wsdlPage.isPageComplete() && mContainer != null)
+ || super.canFinish();
}
-
-
+
}
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizardPage1.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizardPage1.java 2010-05-17 01:14:13 UTC (rev 22109)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizardPage1.java 2010-05-17 04:15:28 UTC (rev 22110)
@@ -10,12 +10,11 @@
* Oracle Corporation
*******************************************************************************/
-
package org.eclipse.bpel.ui.wizards;
+import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
-import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -27,8 +26,11 @@
import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.jface.dialogs.IDialogSettings;
+import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
@@ -39,419 +41,437 @@
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-
import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
/**
*
- * @author Michal Chmielewski (michal.chmielewski(a)oracle.com)
- *
+ * @author Michal Chmielewski (michal.chmielewski(a)oracle.com)
+ *
*/
-public class NewFileWizardPage1 extends WizardPage
-{
+@SuppressWarnings("restriction")
+public class NewFileWizardPage1 extends WizardPage {
static final String EMPTY = ""; //$NON-NLS-1$
-
+
/** last namespace used in creating a project, saved in dialog settings */
static final String LAST_NAMESPACE_KEY = "last.namespace.used"; //$NON-NLS-1$
/** Process name field */
- private Text processNameField;
+ private Text processNameField;
- /** which namespace to use to create the process */
- Combo processNamespaceField;
+ /** which namespace to use to create the process */
+ Combo processNamespaceField;
- /** which template to use to create a process */
- Combo processTemplateField;
-
- /** Template description, in summary */
- Text templateDescription;
+ /** which template to use to create a process */
+ Combo processTemplateField;
- /** option for creating an abstract process */
- Button processAbstractOptionButton;
-
- private Map<String,Object> mArgs = new HashMap<String,Object> (3);
-
- private String[] lastNS;
- private List<String> temNS;
-
-
-
- private Listener validateListner = new Listener() {
+ /** Template description, in summary */
+ Text templateDescription;
+
+ /** option for creating an abstract process */
+ Button processAbstractOptionButton;
+
+ private Map<String, Object> mArgs = new HashMap<String, Object>(3);
+
+ private String[] lastNS;
+ private List<String> temNS;
+
+ private Listener validateListner = new Listener() {
public void handleEvent(Event event) {
- setPageComplete(validatePage());
+ setPageComplete(validatePage());
}
- };
-
-
- // constants
- private static final int SIZING_TEXT_FIELD_WIDTH = 250;
+ };
- /**
- * Creates a new project creation wizard page.
- *
- * @param pageName the name of this page
- */
- public NewFileWizardPage1(String pageName)
- {
- super(pageName);
- setPageComplete(false);
-
+ // constants
+ private static final int SIZING_TEXT_FIELD_WIDTH = 250;
+
+ /**
+ * Creates a new project creation wizard page.
+ *
+ * @param pageName
+ * the name of this page
+ */
+ public NewFileWizardPage1(String pageName) {
+ super(pageName);
+ setPageComplete(false);
+
setTitle(Messages.NewFileWizardPage1_2);
setDescription(Messages.NewFileWizardPage1_3);
-
- setImageDescriptor( BPELUIPlugin.INSTANCE.getImageDescriptor( IBPELUIConstants.ICON_WIZARD_BANNER ));
- }
-
- /**
- * Method declared on IDialogPage.
- * @param parent the parent composite that we must attach ourselves to
- */
-
- public void createControl (Composite parent)
- {
- Composite composite = new Composite(parent, SWT.NULL);
- composite.setFont(parent.getFont());
- initializeDialogUnits(parent);
+ setImageDescriptor(BPELUIPlugin.INSTANCE
+ .getImageDescriptor(IBPELUIConstants.ICON_WIZARD_BANNER));
+ }
- composite.setLayout(new GridLayout());
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
+ /**
+ * Method declared on IDialogPage.
+ *
+ * @param parent
+ * the parent composite that we must attach ourselves to
+ */
- createProjectGroup(composite);
-
- setPageComplete( validatePage() );
-
- // no errors on opening up the wizard
- setErrorMessage(null);
- setMessage(null);
- setControl(composite);
-
- // figure out the what needs to go
- }
-
- /**
- * Creates the project name specification controls.
- *
- * @param parent the parent composite
- */
- private final void createProjectGroup(Composite parent)
- {
- Group projectGroup = new Group(parent, SWT.NONE);
- projectGroup.setText(Messages.NewFileWizardPage1_4);
- projectGroup.setLayout(new GridLayout());
- projectGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-
- Composite fields = new Composite ( projectGroup, SWT.NONE );
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- fields.setLayout(layout);
- fields.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+ public void createControl(Composite parent) {
+ Composite composite = new Composite(parent, SWT.NULL);
+ composite.setFont(parent.getFont());
- // new project label
- Label projectLabel = new Label(fields, SWT.NONE);
- projectLabel.setText( Messages.NewFileWizardPage1_5);
- projectLabel.setFont( parent.getFont() );
+ initializeDialogUnits(parent);
- // new project name entry field
- processNameField = new Text(fields, SWT.BORDER);
- GridData data = new GridData(GridData.FILL_HORIZONTAL);
- data.widthHint = SIZING_TEXT_FIELD_WIDTH;
- processNameField.setLayoutData(data);
- processNameField.setFont(parent.getFont());
+ composite.setLayout(new GridLayout());
+ composite.setLayoutData(new GridData(GridData.FILL_BOTH));
- processNameField.addListener(SWT.Modify, validateListner);
+ createProjectGroup(composite);
- // new project label
- Label namespaceLabel = new Label(fields, SWT.NONE);
- namespaceLabel.setText( Messages.NewFileWizardPage1_6);
- namespaceLabel.setFont(parent.getFont());
-
- // new project name entry field
- processNamespaceField = new Combo( fields, SWT.DROP_DOWN | SWT.SIMPLE );
- data = new GridData(GridData.FILL_HORIZONTAL);
- data.widthHint = SIZING_TEXT_FIELD_WIDTH;
- processNamespaceField.setLayoutData(data);
- processNamespaceField.setFont(parent.getFont());
-
- // add the namespace values
- processNamespaceField.setItems( getProcessNameSpaces() );
- processNamespaceField.addListener(SWT.Modify, validateListner);
-
- String lastNamespace = null;
- if(lastNS != null){
- if(lastNS.length > 0){
- lastNamespace = lastNS[0];
- }
- }
- if (lastNamespace != null) {
- processNamespaceField.setText( lastNamespace );
- }
+ setPageComplete(validatePage());
- // new project type
- Label typeLabel = new Label(fields, SWT.NONE);
- typeLabel.setText( Messages.NewFileWizardPage1_7);
- typeLabel.setFont( parent.getFont() );
+ // no errors on opening up the wizard
+ setErrorMessage(null);
+ setMessage(null);
+ setControl(composite);
- // new project type selector
- processTemplateField = new Combo( fields, SWT.DROP_DOWN | SWT.SIMPLE | SWT.READ_ONLY );
- data = new GridData(GridData.FILL_HORIZONTAL);
- data.widthHint = SIZING_TEXT_FIELD_WIDTH;
- processTemplateField.setLayoutData( data );
-
- processTemplateField.addListener(SWT.Modify, new Listener () {
+ // figure out the what needs to go
+ }
+ /**
+ * Creates the project name specification controls.
+ *
+ * @param parent
+ * the parent composite
+ */
+ private final void createProjectGroup(Composite parent) {
+ Group projectGroup = new Group(parent, SWT.NONE);
+ projectGroup.setText(Messages.NewFileWizardPage1_4);
+ projectGroup.setLayout(new GridLayout());
+ projectGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+ Composite fields = new Composite(projectGroup, SWT.NONE);
+ GridLayout layout = new GridLayout();
+ layout.numColumns = 2;
+ fields.setLayout(layout);
+ fields.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+ // new project label
+ Label projectLabel = new Label(fields, SWT.NONE);
+ projectLabel.setText(Messages.NewFileWizardPage1_5);
+ projectLabel.setFont(parent.getFont());
+
+ // new project name entry field
+ processNameField = new Text(fields, SWT.BORDER);
+ GridData data = new GridData(GridData.FILL_HORIZONTAL);
+ data.widthHint = SIZING_TEXT_FIELD_WIDTH;
+ processNameField.setLayoutData(data);
+ processNameField.setFont(parent.getFont());
+
+ processNameField.addListener(SWT.Modify, validateListner);
+
+ // new project label
+ Label namespaceLabel = new Label(fields, SWT.NONE);
+ namespaceLabel.setText(Messages.NewFileWizardPage1_6);
+ namespaceLabel.setFont(parent.getFont());
+
+ // new project name entry field
+ processNamespaceField = new Combo(fields, SWT.DROP_DOWN | SWT.SIMPLE);
+ data = new GridData(GridData.FILL_HORIZONTAL);
+ data.widthHint = SIZING_TEXT_FIELD_WIDTH;
+ processNamespaceField.setLayoutData(data);
+ processNamespaceField.setFont(parent.getFont());
+
+ // add the namespace values
+ processNamespaceField.setItems(getProcessNameSpaces());
+ processNamespaceField.addListener(SWT.Modify, validateListner);
+
+ String lastNamespace = null;
+ if (lastNS != null) {
+ if (lastNS.length > 0) {
+ lastNamespace = lastNS[0];
+ }
+ }
+ if (lastNamespace != null) {
+ processNamespaceField.setText(lastNamespace);
+ }
+
+ // new project type
+ Label typeLabel = new Label(fields, SWT.NONE);
+ typeLabel.setText(Messages.NewFileWizardPage1_7);
+ typeLabel.setFont(parent.getFont());
+
+ // new project type selector
+ processTemplateField = new Combo(fields, SWT.DROP_DOWN | SWT.SIMPLE
+ | SWT.READ_ONLY);
+ data = new GridData(GridData.FILL_HORIZONTAL);
+ data.widthHint = SIZING_TEXT_FIELD_WIDTH;
+ processTemplateField.setLayoutData(data);
+
+ processTemplateField.addListener(SWT.Modify, new Listener() {
+
public void handleEvent(Event event) {
String val = processTemplateField.getText().trim();
- Template template = BPELUIPlugin.INSTANCE.getTemplates().getTemplateByName( val );
+ mArgs.put("type", val);
+ Template template = BPELUIPlugin.INSTANCE.getTemplates()
+ .getTemplateByName(val);
if (template != null) {
String txt = template.getDescription();
- templateDescription.setText ( txt == null ? EMPTY : txt);
+ templateDescription.setText(txt == null ? EMPTY : txt);
}
-
- }
- });
-
-
-
- templateDescription = new Text(projectGroup,SWT.READ_ONLY | SWT.WRAP | SWT.SCROLL_LINE );
- data = new GridData(GridData.FILL_HORIZONTAL);
- data.widthHint = SIZING_TEXT_FIELD_WIDTH;
- data.heightHint = 60;
- templateDescription.setLayoutData(data);
- templateDescription.setFont(parent.getFont());
-
- // Scan directories in the "templates" folder
- // and built up a list
-
- String templates[] = BPELUIPlugin.INSTANCE.getTemplates().getTemplateNames();
- processTemplateField.setItems(templates);
-
- // Select the top one.
- if (templates.length > 0) {
- processTemplateField.select(0);
- }
-
- //add checkbox for abstract process option
- processAbstractOptionButton = new Button(projectGroup, SWT.CHECK );
- processAbstractOptionButton.setText(Messages.NewFileWizardPage1_9);
- processAbstractOptionButton.setFont(parent.getFont() );
- processAbstractOptionButton.addSelectionListener(new SelectionAdapter(){
- public void widgetSelected(SelectionEvent event) {
- setPageComplete(validatePage());
- }
- });
- }
-
- private String[] getProcessNameSpaces() {
- // project specification group
- IDialogSettings settings = getWizard().getDialogSettings();
- String ns = settings.get( LAST_NAMESPACE_KEY );
- ArrayList<String> list = new ArrayList<String>();
- if(ns != null && !"".equals(ns)) {
- lastNS = ns.split(";");
- for(String str : lastNS){
- list.add(str);
- }
- }
- temNS = new ArrayList<String>();
- for(String str : BPELUIPlugin.INSTANCE.getTemplates().getNamespaceNames()){
- temNS.add(str);
- }
- list.addAll(temNS);
- String[] a = new String[(lastNS == null ? 0 : lastNS.length) + temNS.size()];
+ }
+ });
+
+ templateDescription = new Text(projectGroup, SWT.READ_ONLY | SWT.WRAP
+ | SWT.SCROLL_LINE);
+ data = new GridData(GridData.FILL_HORIZONTAL);
+ data.widthHint = SIZING_TEXT_FIELD_WIDTH;
+ data.heightHint = 60;
+ templateDescription.setLayoutData(data);
+ templateDescription.setFont(parent.getFont());
+
+ // Scan directories in the "templates" folder
+ // and built up a list
+
+ String templates[] = BPELUIPlugin.INSTANCE.getTemplates()
+ .getTemplateNames();
+ processTemplateField.setItems(templates);
+
+ // Select the top one.
+ if (templates.length > 0) {
+ processTemplateField.select(0);
+ }
+
+ // add checkbox for abstract process option
+ processAbstractOptionButton = new Button(projectGroup, SWT.CHECK);
+ processAbstractOptionButton.setText(Messages.NewFileWizardPage1_9);
+ processAbstractOptionButton.setFont(parent.getFont());
+ processAbstractOptionButton
+ .addSelectionListener(new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent event) {
+ setPageComplete(validatePage());
+ }
+ });
+ }
+
+ private String[] getProcessNameSpaces() {
+ // project specification group
+ IDialogSettings settings = getWizard().getDialogSettings();
+ String ns = settings.get(LAST_NAMESPACE_KEY);
+ ArrayList<String> list = new ArrayList<String>();
+ if (ns != null && !"".equals(ns)) {
+ lastNS = ns.split(";");
+ for (String str : lastNS) {
+ list.add(str);
+ }
+ }
+ temNS = new ArrayList<String>();
+ for (String str : BPELUIPlugin.INSTANCE.getTemplates()
+ .getNamespaceNames()) {
+ temNS.add(str);
+ }
+ list.addAll(temNS);
+ String[] a = new String[(lastNS == null ? 0 : lastNS.length)
+ + temNS.size()];
return list.toArray(a);
}
/**
- * Returns the current project name as entered by the user, or its anticipated
- * initial value.
- *
- * @return the project name, its anticipated initial value, or <code>null</code>
- * if no project name is known
- */
- public String getProjectName() {
- return getProjectNameFieldValue();
- }
-
- /**
- * Returns the value of the project name field
- * with leading and trailing spaces removed.
- *
- * @return the project name in the field
- */
- private String getProjectNameFieldValue() {
-
- if (processNameField == null) {
- return EMPTY;
- }
- return processNameField.getText().trim();
- }
-
+ * Returns the current project name as entered by the user, or its
+ * anticipated initial value.
+ *
+ * @return the project name, its anticipated initial value, or
+ * <code>null</code> if no project name is known
+ */
+ public String getProjectName() {
+ return getProjectNameFieldValue();
+ }
-
- /**
- * Returns the current project name as entered by the user, or its anticipated
- * initial value.
- *
- * @return the project name, its anticipated initial value, or <code>null</code>
- * if no project name is known
- */
- public String getProjectNamespace() {
-
- return getProjectNamespaceFieldValue();
- }
- /**
- * Returns the value of the project name field
- * with leading and trailing spaces removed.
- *
- * @return the project name in the field
- */
- private String getProjectNamespaceFieldValue() {
- if (processNameField == null) {
- return EMPTY;
- }
- return processNamespaceField.getText().trim();
- }
+ /**
+ * Returns the value of the project name field with leading and trailing
+ * spaces removed.
+ *
+ * @return the project name in the field
+ */
+ private String getProjectNameFieldValue() {
-
- /**
- * Returns whether this page's controls currently all contain valid
- * values.
- *
- * @return <code>true</code> if all controls are valid, and
- * <code>false</code> if at least one is invalid
- */
- protected boolean validatePage() {
-
- IWorkspace workspace = IDEWorkbenchPlugin.getPluginWorkspace();
+ if (processNameField == null) {
+ return EMPTY;
+ }
+ return processNameField.getText().trim();
+ }
- IDialogSettings settings = getWizard().getDialogSettings();
-
- String processName = processNameField.getText();
-
- if (processName.equals(EMPTY)) {
- setErrorMessage(null);
- setMessage( Messages.NewFileWizardPage1_8);
- return false;
- }
+ /**
+ * Returns the current project name as entered by the user, or its
+ * anticipated initial value.
+ *
+ * @return the project name, its anticipated initial value, or
+ * <code>null</code> if no project name is known
+ */
+ public String getProjectNamespace() {
- IStatus nameStatus =
- workspace.validateName(processName, IResource.FILE);
-
- if (!nameStatus.isOK()) {
- setErrorMessage(nameStatus.getMessage());
- return false;
- }
-
- // Make sure that there are no spaces in the name
- if( processName.indexOf( " " ) > -1 ) //$NON-NLS-1$
- {
- setErrorMessage(Messages.NewFileWizardPage1_10);
- return false;
- }
-
- setErrorMessage(null);
- setMessage(null);
-
- String namespace = processNamespaceField.getText().trim();
- if (namespace.length() < 1) {
- setErrorMessage(Messages.NewFileWizardPage1_11);
- return false;
- }
-
- String bpelNamespace = (isAbstractOptionButtonChecked())?
- BPELConstants.NAMESPACE_ABSTRACT_2007: BPELConstants.NAMESPACE;
-
- // settings for next time the dialog is used.
- settings.put( LAST_NAMESPACE_KEY , addNSToDefault(namespace)) ;
-
- // Template arguments
- mArgs.put("processName", processName ); //$NON-NLS-1$
- mArgs.put("namespace", namespace ); //$NON-NLS-1$
- mArgs.put("bpelNamespace", bpelNamespace ); //$NON-NLS-1$
- mArgs.put("date", new Date() ); //$NON-NLS-1$
+ return getProjectNamespaceFieldValue();
+ }
-
- return true;
- }
+ /**
+ * Returns the value of the project name field with leading and trailing
+ * spaces removed.
+ *
+ * @return the project name in the field
+ */
+ private String getProjectNamespaceFieldValue() {
+ if (processNameField == null) {
+ return EMPTY;
+ }
+ return processNamespaceField.getText().trim();
+ }
- /**
- * add the last namespace to the default namespace array
- *
- * @param namespace
- * @return
- */
- private String addNSToDefault(String namespace) {
- StringBuffer ns = new StringBuffer();
- if(!"".equals(namespace)&& !temNS.contains(namespace)){
- ns.append(namespace).append(";");;
- if(lastNS != null){
- for(int i = 0 ; i<lastNS.length ; i++){
- if(namespace.equals(lastNS[i])){
- continue;
- } else {
- ns.append(lastNS[i]).append(";");
- if(i > 8){
- break;
- }
- }
- }
- }
- } else {
- if(lastNS != null){
- for(String str : lastNS){
- ns.append(str).append(";");
- }
- }
- }
+ /**
+ * Returns whether this page's controls currently all contain valid values.
+ *
+ * @return <code>true</code> if all controls are valid, and
+ * <code>false</code> if at least one is invalid
+ */
+ protected boolean validatePage() {
+
+ IWorkspace workspace = IDEWorkbenchPlugin.getPluginWorkspace();
+
+ IDialogSettings settings = getWizard().getDialogSettings();
+
+ String processName = processNameField.getText();
+
+ if (processName.equals(EMPTY)) {
+ setErrorMessage(null);
+ setMessage(Messages.NewFileWizardPage1_8);
+ return false;
+ }
+
+ IStatus nameStatus = workspace
+ .validateName(processName, IResource.FILE);
+
+ if (!nameStatus.isOK()) {
+ setErrorMessage(nameStatus.getMessage());
+ return false;
+ }
+
+ // Make sure that there are no spaces in the name
+ if (processName.indexOf(" ") > -1) //$NON-NLS-1$
+ {
+ setErrorMessage(Messages.NewFileWizardPage1_10);
+ return false;
+ }
+
+ setErrorMessage(null);
+ setMessage(null);
+
+ String namespace = processNamespaceField.getText().trim();
+ if (namespace.length() < 1) {
+ setErrorMessage(Messages.NewFileWizardPage1_11);
+ return false;
+ }
+
+ String bpelNamespace = (isAbstractOptionButtonChecked()) ? BPELConstants.NAMESPACE_ABSTRACT_2007
+ : BPELConstants.NAMESPACE;
+
+ // settings for next time the dialog is used.
+ settings.put(LAST_NAMESPACE_KEY, addNSToDefault(namespace));
+
+ // Template arguments
+ mArgs.put("processName", processName); //$NON-NLS-1$
+ mArgs.put("namespace", namespace); //$NON-NLS-1$
+ mArgs.put("bpelNamespace", bpelNamespace); //$NON-NLS-1$
+ mArgs.put("date", new Date()); //$NON-NLS-1$
+
+ // set the default value of the wsdlpage
+ setValuesForWSDLPage(processName);
+
+ return true;
+ }
+
+ private void setValuesForWSDLPage(String processName) {
+ WSDLCustomPage page = (WSDLCustomPage) this.getWizard().getPage(
+ Messages.NewFileWizard_WSDLCustomPage_Name);
+ if (page != null) {
+ page.getServiceNameField().setText(processName);
+ page.getPortNameField().setText(processName + "Port");
+ page.getAddressField().setText(
+ "http://localhost:8080/" + processName);
+ }
+ }
+
+ public IWizardPage getNextPage() {
+ if (processAbstractOptionButton.getSelection()) {
+ return this.getWizard().getPage(Messages.NewFileWizardPage2_Name);
+ }
+ return super.getNextPage();
+ }
+
+ /**
+ * add the last namespace to the default namespace array
+ *
+ * @param namespace
+ * @return
+ */
+ private String addNSToDefault(String namespace) {
+ StringBuffer ns = new StringBuffer();
+ if (!"".equals(namespace) && !temNS.contains(namespace)) {
+ ns.append(namespace).append(";");
+ ;
+ if (lastNS != null) {
+ for (int i = 0; i < lastNS.length; i++) {
+ if (namespace.equals(lastNS[i])) {
+ continue;
+ } else {
+ ns.append(lastNS[i]).append(";");
+ if (i > 8) {
+ break;
+ }
+ }
+ }
+ }
+ } else {
+ if (lastNS != null) {
+ for (String str : lastNS) {
+ ns.append(str).append(";");
+ }
+ }
+ }
return ns.toString();
}
/**
- * @return true if Option for abstract process is checked
- */
- private boolean isAbstractOptionButtonChecked() {
- return processAbstractOptionButton.getSelection();
- }
-
- /**
- * see @DialogPage.setVisible(boolean)
- * @param visible whether should be visible or not
- *
- */
-
- @Override
- public void setVisible (boolean visible) {
- super.setVisible(visible);
- if (visible) {
- processNameField.setFocus();
- }
- }
+ * @return true if Option for abstract process is checked
+ */
+ private boolean isAbstractOptionButtonChecked() {
+ return processAbstractOptionButton.getSelection();
+ }
/**
+ * see @DialogPage.setVisible(boolean)
+ *
+ * @param visible
+ * whether should be visible or not
+ *
+ */
+
+ @Override
+ public void setVisible(boolean visible) {
+ super.setVisible(visible);
+ if (visible) {
+ processNameField.setFocus();
+ }
+ }
+
+ /**
* @return the actual selected template.
*/
-
+
public Template getSelectedTemplate() {
String txt = processTemplateField.getText().trim();
- return BPELUIPlugin.INSTANCE.getTemplates().getTemplateByName( txt );
+ return BPELUIPlugin.INSTANCE.getTemplates().getTemplateByName(txt);
}
/**
* @return the arguments that need to be supplied to the template mechanism.
*/
-
- public Map<String,Object> getArgs() {
-
+
+ public Map<String, Object> getArgs() {
+
return mArgs;
}
-
-
}
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizardPage2.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizardPage2.java 2010-05-17 01:14:13 UTC (rev 22109)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizardPage2.java 2010-05-17 04:15:28 UTC (rev 22110)
@@ -43,7 +43,7 @@
super(pageName);
setPageComplete(false);
- setTitle(Messages.NewFileWizardPage1_2);
+ setTitle(Messages.NewFileWizardPage2_3);
setDescription(Messages.NewFileWizardPage2_0);
setImageDescriptor( BPELUIPlugin.INSTANCE.getImageDescriptor( IBPELUIConstants.ICON_WIZARD_BANNER ));
Added: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/WSDLCustomPage.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/WSDLCustomPage.java (rev 0)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/WSDLCustomPage.java 2010-05-17 04:15:28 UTC (rev 22110)
@@ -0,0 +1,210 @@
+package org.eclipse.bpel.ui.wizards;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.bpel.ui.BPELUIPlugin;
+import org.eclipse.bpel.ui.IBPELUIConstants;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Text;
+
+public class WSDLCustomPage extends WizardPage {
+
+ /** Service name field */
+ private Text serviceNameField;
+
+ /** Port name field */
+ private Text portNameField;
+
+ /** Address name field */
+ private Text addressField;
+
+ /** binding protocol */
+ Combo bindingField;
+
+ private Map<String, String> mArgs = new HashMap<String, String>();
+
+ static final String EMPTY = "";
+ static final String SOAP_NAMESPACE="http://schemas.xmlsoap.org/wsdl/soap/";
+ static final String HTTP_NAMESPACE="http://schemas.xmlsoap.org/wsdl/http/";
+
+ private static final int SIZING_TEXT_FIELD_WIDTH = 250;
+
+ private Listener validateListner = new Listener() {
+ public void handleEvent(Event event) {
+ setPageComplete(validatePage());
+ }
+ };
+
+ /**
+ * New File Wizard,wsdl page that custom the generated wsdl file
+ *
+ * @param pageName
+ */
+ protected WSDLCustomPage(String pageName) {
+ super(pageName);
+ setTitle(Messages.NewFileWizard_WSDLCustomPage_Title);
+ setDescription(Messages.NewFileWizard_WSDLCustomPage_Description);
+ setImageDescriptor(BPELUIPlugin.INSTANCE
+ .getImageDescriptor(IBPELUIConstants.ICON_WIZARD_BANNER));
+ }
+
+ public void createControl(Composite parent) {
+ Composite composite = new Composite(parent, SWT.NULL);
+ composite.setFont(parent.getFont());
+ initializeDialogUnits(parent);
+ composite.setLayout(new GridLayout());
+ composite.setLayoutData(new GridData(GridData.FILL_BOTH));
+ createWSDLGroup(composite);
+ setErrorMessage(null);
+ setMessage(null);
+ setControl(composite);
+ }
+
+ private final void createWSDLGroup(Composite parent) {
+ Group wsdlGroup = new Group(parent, SWT.NONE);
+ wsdlGroup.setText(Messages.NewFileWizard_WSDLCustomPage_WSDLGroup);
+ wsdlGroup.setLayout(new GridLayout());
+ wsdlGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+ Composite fields = new Composite(wsdlGroup, SWT.NONE);
+ GridLayout layout = new GridLayout();
+ layout.numColumns = 2;
+ fields.setLayout(layout);
+ fields.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+ // new service label
+ Label serviceLabel = new Label(fields, SWT.NONE);
+ serviceLabel
+ .setText(Messages.NewFileWizard_WSDLCustomPage_ServiceLable);
+ serviceLabel.setFont(parent.getFont());
+
+ // new service name entry field
+ serviceNameField = new Text(fields, SWT.BORDER);
+ GridData data = new GridData(GridData.FILL_HORIZONTAL);
+ data.widthHint = SIZING_TEXT_FIELD_WIDTH;
+ serviceNameField.setLayoutData(data);
+ serviceNameField.setFont(parent.getFont());
+ serviceNameField.addListener(SWT.Modify, validateListner);
+
+ // new port label
+ Label portLabel = new Label(fields, SWT.NONE);
+ portLabel.setText(Messages.NewFileWizard_WSDLCustomPage_PortLabel);
+ portLabel.setFont(parent.getFont());
+
+ // new port name entry field
+ portNameField = new Text(fields, SWT.BORDER);
+ data = new GridData(GridData.FILL_HORIZONTAL);
+ data.widthHint = SIZING_TEXT_FIELD_WIDTH;
+ portNameField.setLayoutData(data);
+ portNameField.setFont(parent.getFont());
+ portNameField.addListener(SWT.Modify, validateListner);
+
+ // new address label
+ Label addressLabel = new Label(fields, SWT.NONE);
+ addressLabel
+ .setText(Messages.NewFileWizard_WSDLCustomPage_AddressLabel);
+ addressLabel.setFont(parent.getFont());
+
+ // new address name entry field
+ addressField = new Text(fields, SWT.BORDER);
+ data = new GridData(GridData.FILL_HORIZONTAL);
+ data.widthHint = SIZING_TEXT_FIELD_WIDTH;
+ addressField.setLayoutData(data);
+ addressField.setFont(parent.getFont());
+ addressField.addListener(SWT.Modify, validateListner);
+
+ Label bindingLabel = new Label(fields, SWT.NONE);
+ bindingLabel
+ .setText(Messages.NewFileWizard_WSDLCustomPage_BindingLabel);
+ bindingLabel.setFont(parent.getFont());
+ // new binding protocol entry field
+ bindingField = new Combo(fields, SWT.DROP_DOWN | SWT.SIMPLE);
+ data = new GridData(GridData.FILL_HORIZONTAL);
+ data.widthHint = SIZING_TEXT_FIELD_WIDTH;
+ bindingField.setLayoutData(data);
+ bindingField.setFont(parent.getFont());
+
+ // add the binding protocol values
+ bindingField.setItems(new String[] { "SOAP", "HTTP" });
+ bindingField.setText("SOAP");
+ bindingField.addListener(SWT.Modify, validateListner);
+ }
+
+ protected boolean validatePage() {
+ String serviceName = serviceNameField.getText().trim();
+ if (isEmptyOrSpace(serviceName, "Service Name")) {
+ return false;
+ }
+ String portName = portNameField.getText().trim();
+ if (isEmptyOrSpace(portName, "Port Name")) {
+ return false;
+ }
+ String addressName = addressField.getText().trim();
+ if (isEmptyOrSpace(addressName, "Service Address")) {
+ return false;
+ }
+ String protocol = bindingField.getText().trim();
+ if (!("SOAP".equals(protocol) || "HTTP".equals(protocol))) {
+ setErrorMessage(Messages.Error_NewFileWizard_WSDLCustomPage_Protocol);
+ return false;
+ }
+ setErrorMessage(null);
+
+ // Template arguments
+ mArgs.put("serviceName", serviceName); //$NON-NLS-1$
+ mArgs.put("portName", portName); //$NON-NLS-1$
+ mArgs.put("address", addressName); //$NON-NLS-1$
+ mArgs.put("protocol", protocol.toLowerCase()); //$NON-NLS-1$
+ if("SOAP".equals(protocol)){
+ mArgs.put("protocolNamespace", SOAP_NAMESPACE);
+ } else {
+ mArgs.put("protocolNamespace", HTTP_NAMESPACE);
+ }
+ return true;
+ }
+
+ private boolean isEmptyOrSpace(String name, String element) {
+ if (name.equals(EMPTY)) {
+ setErrorMessage(NLS.bind(
+ Messages.Error_NewFileWizard_WSDLCustomPage_Name_Empty,
+ element));
+ return true;
+ }
+
+ if (name.indexOf(" ") > -1) {
+ setErrorMessage(NLS.bind(
+ Messages.Error_NewFileWizard_WSDLCustomPage_Name_Space,
+ element));
+ return true;
+ }
+ return false;
+ }
+
+ public Text getServiceNameField() {
+ return serviceNameField;
+ }
+
+ public Text getPortNameField() {
+ return portNameField;
+ }
+
+ public Text getAddressField() {
+ return addressField;
+ }
+
+ public Map<String, String> getMap() {
+ return mArgs;
+ }
+
+}
Property changes on: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/WSDLCustomPage.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/WSDLServiceDetail.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/WSDLServiceDetail.java (rev 0)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/WSDLServiceDetail.java 2010-05-17 04:15:28 UTC (rev 22110)
@@ -0,0 +1,11 @@
+package org.eclipse.bpel.ui.wizards;
+
+public class WSDLServiceDetail {
+
+ public static final String Sync_SOAPDetail = "\n<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n BINDING DEFINITION - Defines the message format and protocol details\n for a web service.\n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->\n <binding name=\"${processName}Binding\" type=\"tns:${processName}\">\n <soap:binding style=\"document\"\n transport=\"http://schemas.xmlsoap.org/soap/http\" />\n <operation name=\"process\">\n <soap:operation\n soapAction=\"${namespace}/process\" />\n <input>\n <soap:body use=\"literal\" />\n </input>\n <output>\n <soap:body use=\"literal\" />\n </output>\n </operation>\n </binding>\n\n<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n SERVICE DEFINITION - A service groups a set of port into\n a service unit.\n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~!
~~~~~~~~ -->\n <service name=\"${serviceName}\">\n <port name=\"${portName}\" binding=\"tns:${processName}Binding\">\n <soap:address location=\"${address}\" />\n </port>\n </service>\n";
+ public static final String Sync_HTTPDetail = "\n<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n BINDING DEFINITION - Defines the message format and protocol details\n for a web service.\n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->\n <binding name=\"${processName}Binding\" type=\"tns:${processName}\" xmlns:mime=\"http://schemas.xmlsoap.org/wsdl/mime/\">\n <http:binding verb=\"POST\" />\n <operation name=\"process\">\n <http:operation location=\"/process\" />\n <input>\n <mime:content type=\"text/xml\" part=\"payload\"/>\n </input>\n <output>\n <mime:content type=\"text/xml\" part=\"payload\"/>\n </output>\n </operation>\n </binding>\n\n<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n SERVICE DEFINITION - A service groups a set of port into\n a service unit.\n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~!
~~~~~~~~~~~~~~~~~~~~ -->\n <service name=\"${serviceName}\">\n <port name=\"${portName}\" binding=\"tns:${processName}Binding\">\n <http:address location=\"${address}\"/>\n </port>\n </service>\n";
+ public static final String Async_SOAPDetail = "\n<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n BINDING DEFINITION - Defines the message format and protocol details\n for a web service.\n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->\n <binding name=\"${processName}Binding\" type=\"tns:${processName}\">\n <soap:binding style=\"document\"\n transport=\"http://schemas.xmlsoap.org/soap/http\"/>\n <operation name=\"initiate\">\n <soap:operation\n soapAction=\"${namespace}/initiate\"/>\n <input>\n <soap:body use=\"literal\"/>\n </input>\n </operation>\n </binding>\n\n <binding name=\"${processName}CallbackBinding\" type=\"tns:${processName}Callback\">\n <soap:binding style=\"document\" transport=\"http://schemas.xmlsoap.org/soap/http\"/>\n <operation name=\"onResult\">\n <soap:operation\n so!
apAction=\"${namespace}/onResult\"/>\n <input>\n <soap:body use=\"literal\"/>\n </input>\n </operation>\n </binding>\n\n<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n SERVICE DEFINITION - A service groups a set of port into\n a service unit.\n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->\n <service name=\"${serviceName}\">\n <port name=\"${portName}\" binding=\"tns:${processName}Binding\">\n <soap:address location=\"${address}\"/>\n </port>\n </service>\n\n <service name=\"${serviceName}Callback\">\n <port name=\"${portName}CallbackPort\" binding=\"tns:${processName}CallbackBinding\">\n <soap:address location=\"${address}Callback\"/>\n </port>\n </service>\n";
+ public static final String Async_HTTPDetail = "\n<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n BINDING DEFINITION - Defines the message format and protocol details\n for a web service.\n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->\n <binding name=\"${processName}Binding\" type=\"tns:${processName}\" xmlns:mime=\"http://schemas.xmlsoap.org/wsdl/mime/\">\n <http:binding verb=\"POST\" />\n <operation name=\"initiate\">\n <http:operation location=\"/initiate\" />\n <input>\n <mime:content type=\"text/xml\" part=\"payload\"/>\n </input>\n </operation>\n </binding>\n\n <binding name=\"${processName}CallbackBinding\" type=\"tns:${processName}Callback\" xmlns:mime=\"http://schemas.xmlsoap.org/wsdl/mime/\">\n <http:binding verb=\"POST\" />\n <operation name=\"onResult\">\n <http:operation location=\"/onResult\" />\n <input>\n <mime:content type!
=\"text/xml\" part=\"payload\"/>\n </input>\n </operation>\n </binding>\n\n<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n SERVICE DEFINITION - A service groups a set of port into\n a service unit.\n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->\n <service name=\"${serviceName}\">\n <port name=\"${portName}\" binding=\"tns:${processName}Binding\">\n <http:address location=\"${address}\"/>\n </port>\n </service>\n\n <service name=\"${serviceName}Callback\">\n <port name=\"${portName}CallbackPort\" binding=\"tns:${processName}CallbackBinding\">\n <http:address location=\"${address}Callback\"/>\n </port>\n </service>\n";
+
+
+}
Property changes on: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/WSDLServiceDetail.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/messages.properties
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/messages.properties 2010-05-17 01:14:13 UTC (rev 22109)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/messages.properties 2010-05-17 04:15:28 UTC (rev 22110)
@@ -1,4 +1,5 @@
NewFileWizard_1=New BPEL Process
+NewFileWizardPage1_Name=ProcessPage
NewFileWizardPage1_2=Create a BPEL Process File
NewFileWizardPage1_3=Create a 2.0 BPEL file.
NewFileWizardPage1_4=Process Details
@@ -7,11 +8,24 @@
NewFileWizardPage1_7=Template:
NewFileWizardPage1_8=Specify the name of this BPEL file.
NewFileWizardPage1_9=Abstract Process
-NewFileWizardPage2_0=Select location for the BPEL source file.
-NewFileWizardPage2_1=Select Project or Folder for the BPEL file.
+NewFileWizardPage2_Name=LocationPage
+NewFileWizardPage2_0=Select location for the BPEL source files.
+NewFileWizardPage2_1=Select Project or Folder for the BPEL files.
NewFileWizardPage2_2=
+NewFileWizardPage2_3=Select Files Location
NewFileWizardPage1_10=Name must not include a space.
NewFileWizardPage1_11=Namespace of the process cannot be empty.
+NewFileWizard_WSDLCustomPage_Name=WSDLPage
+NewFileWizard_WSDLCustomPage_Title=Create a WSDL File
+NewFileWizard_WSDLCustomPage_Description=Create a WSDL File for the BPEL Process
+NewFileWizard_WSDLCustomPage_WSDLGroup=WSDL Details
+NewFileWizard_WSDLCustomPage_ServiceLable=Service Name
+NewFileWizard_WSDLCustomPage_PortLabel=Port Name
+NewFileWizard_WSDLCustomPage_AddressLabel=Service Address
+NewFileWizard_WSDLCustomPage_BindingLabel=Binding Protocol
+Error_NewFileWizard_WSDLCustomPage_Name_Empty=Specify a {0} for the BPEL process in the WSDL file.
+Error_NewFileWizard_WSDLCustomPage_Name_Space={0} must not include a space.
+Error_NewFileWizard_WSDLCustomPage_Protocol=The Binding Protocol must be 'SOAP' or 'HTTP'.
BPELCreateOperation_0=Creating process from template ...
CreatePartnerLinkWizard_0=Create Partner Link Type
CreatePartnerLinkWizard_2=Create new Partner Link Type
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/templates/async/sample.bpel
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/templates/async/sample.bpel 2010-05-17 01:14:13 UTC (rev 22109)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/templates/async/sample.bpel 2010-05-17 04:15:28 UTC (rev 22110)
@@ -58,7 +58,7 @@
portType="tns:${processName}"
operation="initiate" variable="input"
createInstance="yes"/>
-
+ <bpel:empty name="FIX_ME-Add_Business_Logic_Here"></bpel:empty>
<!-- Asynchronous callback to the requester.
Note: the callback location and correlation id is transparently handled
using WS-addressing.
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/templates/async/sample.wsdl
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/templates/async/sample.wsdl 2010-05-17 01:14:13 UTC (rev 22109)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/templates/async/sample.wsdl 2010-05-17 04:15:28 UTC (rev 22110)
@@ -4,6 +4,7 @@
xmlns:tns="${namespace}"
xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:${protocol}="${protocolNamespace}"
>
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/templates/sync/sample.bpel
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/templates/sync/sample.bpel 2010-05-17 01:14:13 UTC (rev 22109)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/templates/sync/sample.bpel 2010-05-17 04:15:28 UTC (rev 22110)
@@ -52,7 +52,7 @@
portType="tns:${processName}"
operation="process" variable="input"
createInstance="yes"/>
-
+ <bpel:empty name="FIX_ME-Add_Business_Logic_Here"></bpel:empty>
<!-- Generate reply to synchronous request -->
<bpel:reply name="replyOutput"
partnerLink="client"
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/templates/sync/sample.wsdl
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/templates/sync/sample.wsdl 2010-05-17 01:14:13 UTC (rev 22109)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/templates/sync/sample.wsdl 2010-05-17 04:15:28 UTC (rev 22110)
@@ -4,6 +4,7 @@
xmlns:tns="${namespace}"
xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:${protocol}="${protocolNamespace}"
>
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -58,9 +59,7 @@
<input message="tns:${processName}RequestMessage" />
<output message="tns:${processName}ResponseMessage"/>
</operation>
- </portType>
-
-
+ </portType>
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
PARTNER LINK TYPE DEFINITION
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
15 years, 11 months
- 1
- 0
JBoss Tools SVN: r22109 - trunk/documentation/guides/JBDS_Release_Notes/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2010-05-16 21:14:13 -0400 (Sun, 16 May 2010)
New Revision: 22109
Modified:
trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml
Log:
updated release notes
Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml
===================================================================
--- trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 2010-05-16 22:12:36 UTC (rev 22108)
+++ trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 2010-05-17 01:14:13 UTC (rev 22109)
@@ -162,6 +162,11 @@
<itemizedlist>
<listitem>
<para>
+ <ulink url="http://jira.jboss.com/jira/browse/JBDS-1220">JBDS-1220</ulink>: Within the JBoss Developer Studio, the browse button that allowed a user to select the location of the JBoss Application Server would not default to the location where the JBoss Enterprise Application Platform was installed. The consequence of this was that a user would have to search for the installed location of the JBoss Enterprise Application Platform. Though installation of the JBoss Enterprise Application Platform is optional, if it is installed it can be assumed that this will be the Application Server a user will wish to use. In order to improve the user experience, when the JBoss Enterprise Application Platform is installed, the server location browse button will default to that directory.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
<ulink url="http://jira.jboss.com/jira/browse/JBDS-1215">JBDS-1215</ulink>: The installer was unable to locate the Seam runtimes within the JBoss Enterprise Application Platform 4.3. This occurred because the Seam runtime locations bundled within the JBoss Enterprise Application Platform 4.3 had recently changed from <filename>jboss-eap-4.3/seam</filename> and <filename>jboss-eap-4.3/seamfp</filename> to being <filename>jboss-eap-4.3/seam1</filename> and <filename>jboss-eap-4.3/seam2</filename>. This version of the JBoss Developer Studio includes an updated installer that contains the new Seam runtime locations. The installer is now able to find the Seam runtimes for the latest versions of the JBoss Enterprise Application Platform 4.3.
</para>
</listitem>
@@ -195,6 +200,11 @@
<ulink url="http://jira.jboss.com/jira/browse/JBDS-1088">JBDS-1088</ulink>: When installing the JBoss Developer Studio, if a previous installation was detected a dialog box would ask if you wished to overwrite the existing directory. If a user continued with installation they would then have a mixture of the old and new product versions. To better assist users a new warning is displayed in this situation, which indicates that you cannot upgrade by installing a new version over an old version. This new dialog box ensures that a user is informed of what will happen.
</para>
</listitem>
+ <listitem>
+ <para>
+ <ulink url="http://jira.jboss.com/jira/browse/JBDS-1047">JBDS-1047</ulink>: When installing the JBoss Developer Studio a user would not be warned if they were installing it as the root user on a Linux distribution. The consequence of this was that if a user uninstalled the software certain files would be left behind (such as menu items). In order to ensure a user is aware they are installing the JBoss Developer Studio as root, a warning is displayed informing them. The JBoss Developer Studio does not stop you from installing the software as the root user, rather it ensures this is what the user has intended to do.
+ </para>
+ </listitem>
</itemizedlist>
</para>
</formalpara>
15 years, 11 months
- 1
- 0
JBoss Tools SVN: r22108 - in branches/jbosstools-3.1.x/maven/plugins: org.jboss.tools.maven.seam/poms and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2010-05-16 18:12:36 -0400 (Sun, 16 May 2010)
New Revision: 22108
Modified:
branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.core/poms/hibernate332-template.xml
branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.seam/poms/parent-pom.xml
Log:
https://jira.jboss.org/browse/JBIDE-6294 Add JBoss Public Maven Repository Group when creating JBoss Maven Integration facet
Modified: branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.core/poms/hibernate332-template.xml
===================================================================
--- branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.core/poms/hibernate332-template.xml 2010-05-16 22:09:22 UTC (rev 22107)
+++ branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.core/poms/hibernate332-template.xml 2010-05-16 22:12:36 UTC (rev 22108)
@@ -8,6 +8,20 @@
<version>0.0.1-SNAPSHOT</version>
<repositories>
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
<repository>
<id>repository.jboss.org</id>
<name>JBoss Repository</name>
Modified: branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.seam/poms/parent-pom.xml
===================================================================
--- branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.seam/poms/parent-pom.xml 2010-05-16 22:09:22 UTC (rev 22107)
+++ branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.seam/poms/parent-pom.xml 2010-05-16 22:12:36 UTC (rev 22108)
@@ -37,28 +37,24 @@
<maven>2.0.9</maven>
</prerequisites>
- <repositories>
- <repository>
- <id>jboss</id>
- <name>JBoss Repository</name>
- <url>http://repository.jboss.org/maven2</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>jboss-snapshots</id>
- <name>JBoss Snapshot Repository</name>
- <url>http://snapshots.jboss.org/maven2</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
+
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <layout>default</layout>
+ <releases>
<enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
<dependencyManagement>
<dependencies>
<dependency>
@@ -460,6 +456,42 @@
</dependencies>
</dependencyManagement>
+ <repositories>
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>jboss</id>
+ <name>JBoss Repository</name>
+ <url>http://repository.jboss.org/maven2</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>jboss-snapshots</id>
+ <name>JBoss Snapshot Repository</name>
+ <url>http://snapshots.jboss.org/maven2</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
<build>
<plugins>
<plugin>
15 years, 11 months
- 1
- 0
JBoss Tools SVN: r22107 - in trunk/maven/plugins: org.jboss.tools.maven.seam/poms and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2010-05-16 18:09:22 -0400 (Sun, 16 May 2010)
New Revision: 22107
Modified:
trunk/maven/plugins/org.jboss.tools.maven.core/poms/hibernate332-template.xml
trunk/maven/plugins/org.jboss.tools.maven.seam/poms/parent-pom.xml
Log:
https://jira.jboss.org/browse/JBIDE-6294 Add JBoss Public Maven Repository Group when creating JBoss Maven Integration facet
Modified: trunk/maven/plugins/org.jboss.tools.maven.core/poms/hibernate332-template.xml
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.core/poms/hibernate332-template.xml 2010-05-16 21:41:03 UTC (rev 22106)
+++ trunk/maven/plugins/org.jboss.tools.maven.core/poms/hibernate332-template.xml 2010-05-16 22:09:22 UTC (rev 22107)
@@ -8,6 +8,20 @@
<version>0.0.1-SNAPSHOT</version>
<repositories>
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
<repository>
<id>repository.jboss.org</id>
<name>JBoss Repository</name>
Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/poms/parent-pom.xml
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.seam/poms/parent-pom.xml 2010-05-16 21:41:03 UTC (rev 22106)
+++ trunk/maven/plugins/org.jboss.tools.maven.seam/poms/parent-pom.xml 2010-05-16 22:09:22 UTC (rev 22107)
@@ -37,28 +37,24 @@
<maven>2.0.9</maven>
</prerequisites>
- <repositories>
- <repository>
- <id>jboss</id>
- <name>JBoss Repository</name>
- <url>http://repository.jboss.org/maven2</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>jboss-snapshots</id>
- <name>JBoss Snapshot Repository</name>
- <url>http://snapshots.jboss.org/maven2</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
+
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <layout>default</layout>
+ <releases>
<enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
<dependencyManagement>
<dependencies>
<dependency>
@@ -460,6 +456,42 @@
</dependencies>
</dependencyManagement>
+ <repositories>
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>jboss</id>
+ <name>JBoss Repository</name>
+ <url>http://repository.jboss.org/maven2</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>jboss-snapshots</id>
+ <name>JBoss Snapshot Repository</name>
+ <url>http://snapshots.jboss.org/maven2</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
<build>
<plugins>
<plugin>
15 years, 11 months
- 1
- 0
JBoss Tools SVN: r22106 - in branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.core: poms and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2010-05-16 17:41:03 -0400 (Sun, 16 May 2010)
New Revision: 22106
Added:
branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.core/poms/portletbridge-template200final.xml
branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.core/poms/portletbridge-template200finaldep.xml
Modified:
branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.core/plugin.properties
branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.core/plugin.xml
Log:
https://jira.jboss.org/browse/JBIDE-6293 Add Maven Portletbridge 2.0.0 FINAL library provider
Modified: branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.core/plugin.properties
===================================================================
--- branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.core/plugin.properties 2010-05-16 21:37:40 UTC (rev 22105)
+++ branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.core/plugin.properties 2010-05-16 21:41:03 UTC (rev 22106)
@@ -10,4 +10,6 @@
Maven_Portlet_1_0_Libraries=Maven Portlet 1.0 Libraries
Maven_Portlet_2_0_Libraries=Maven Portlet 2.0 Libraries
Maven_Portletbridge_2_0_0_ALPHA_Libraries=Maven Portletbridge 2.0.0 ALPHA Libraries
-Maven_Portletbridge_2_0_0_ALPHA_Libraries_with_Dependencies=Maven Portletbridge 2.0.0 ALPHA Libraries with Dependencies
\ No newline at end of file
+Maven_Portletbridge_2_0_0_ALPHA_Libraries_with_Dependencies=Maven Portletbridge 2.0.0 ALPHA Libraries with Dependencies
+Maven_Portletbridge_2_0_0_FINAL_Libraries=Maven Portletbridge 2.0.0 FINAL Libraries
+Maven_Portletbridge_2_0_0_FINAL_Libraries_with_Dependencies=Maven Portletbridge 2.0.0 FINAL Libraries with Dependencies
\ No newline at end of file
Modified: branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.core/plugin.xml
===================================================================
--- branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.core/plugin.xml 2010-05-16 21:37:40 UTC (rev 22105)
+++ branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.core/plugin.xml 2010-05-16 21:41:03 UTC (rev 22106)
@@ -185,4 +185,36 @@
</enablement>
</provider>
</extension>
+ <extension point="org.eclipse.jst.common.project.facet.core.libraryProviders">
+ <provider id="portletbridge200final-maven-library-provider" extends="maven-library-provider">
+ <label>%Maven_Portletbridge_2_0_0_FINAL_Libraries</label>
+ <param name="template" value="platform:/plugin/org.jboss.tools.maven.core/poms/portletbridge-template200final.xml"/>
+ <enablement>
+ <and>
+ <with variable="projectFacets">
+ <test property="org.jboss.tools.maven.core.projectFacets" value="jboss.jsfportlet,jboss.m2" forcePluginActivation="true"/>
+ </with>
+ <with variable="requestingProjectFacet">
+ <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jboss.jsfportlet:1.0" forcePluginActivation="true"/>
+ </with>
+ </and>
+ </enablement>
+ </provider>
+ </extension>
+ <extension point="org.eclipse.jst.common.project.facet.core.libraryProviders">
+ <provider id="portletbridge200finaldep-maven-library-provider" extends="maven-library-provider">
+ <label>%Maven_Portletbridge_2_0_0_FINAL_Libraries_with_Dependencies</label>
+ <param name="template" value="platform:/plugin/org.jboss.tools.maven.core/poms/portletbridge-template200finaldep.xml"/>
+ <enablement>
+ <and>
+ <with variable="projectFacets">
+ <test property="org.jboss.tools.maven.core.projectFacets" value="jboss.jsfportlet,jboss.m2" forcePluginActivation="true"/>
+ </with>
+ <with variable="requestingProjectFacet">
+ <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jboss.jsfportlet:1.0" forcePluginActivation="true"/>
+ </with>
+ </and>
+ </enablement>
+ </provider>
+ </extension>
</plugin>
Added: branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.core/poms/portletbridge-template200final.xml
===================================================================
--- branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.core/poms/portletbridge-template200final.xml (rev 0)
+++ branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.core/poms/portletbridge-template200final.xml 2010-05-16 21:41:03 UTC (rev 22106)
@@ -0,0 +1,52 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>template</groupId>
+ <artifactId>template</artifactId>
+ <packaging>pom</packaging>
+ <version>0.0.1-SNAPSHOT</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.portletbridge</groupId>
+ <artifactId>portletbridge-api</artifactId>
+ <version>2.0.0.FINAL</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.portletbridge</groupId>
+ <artifactId>portletbridge-impl</artifactId>
+ <version>2.0.0.FINAL</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ </exclusion>
+
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ </dependencies>
+</project>
\ No newline at end of file
Added: branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.core/poms/portletbridge-template200finaldep.xml
===================================================================
--- branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.core/poms/portletbridge-template200finaldep.xml (rev 0)
+++ branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.core/poms/portletbridge-template200finaldep.xml 2010-05-16 21:41:03 UTC (rev 22106)
@@ -0,0 +1,117 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>template</groupId>
+ <artifactId>template</artifactId>
+ <packaging>pom</packaging>
+ <version>0.0.1-SNAPSHOT</version>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>javax.portlet</groupId>
+ <artifactId>portlet-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+
+ <dependency>
+ <groupId>org.jboss.portletbridge</groupId>
+ <artifactId>portletbridge-api</artifactId>
+ <version>2.0.0.FINAL</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.portletbridge</groupId>
+ <artifactId>portletbridge-impl</artifactId>
+ <version>2.0.0.FINAL</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ </exclusion>
+
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui</artifactId>
+ <version>3.3.3.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-api</artifactId>
+ <version>3.3.3.Final</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-impl</artifactId>
+ <version>3.3.3.Final</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </exclusion>
+
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.facelets</groupId>
+ <artifactId>jsf-facelets</artifactId>
+ <version>1.1.15.B1</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
15 years, 11 months
- 1
- 0
JBoss Tools SVN: r22105 - in trunk/maven/plugins/org.jboss.tools.maven.core: poms and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2010-05-16 17:37:40 -0400 (Sun, 16 May 2010)
New Revision: 22105
Added:
trunk/maven/plugins/org.jboss.tools.maven.core/poms/portletbridge-template200final.xml
trunk/maven/plugins/org.jboss.tools.maven.core/poms/portletbridge-template200finaldep.xml
Modified:
trunk/maven/plugins/org.jboss.tools.maven.core/plugin.properties
trunk/maven/plugins/org.jboss.tools.maven.core/plugin.xml
Log:
https://jira.jboss.org/browse/JBIDE-6293 Add Maven Portletbridge 2.0.0 FINAL library provider
Modified: trunk/maven/plugins/org.jboss.tools.maven.core/plugin.properties
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.core/plugin.properties 2010-05-15 14:51:11 UTC (rev 22104)
+++ trunk/maven/plugins/org.jboss.tools.maven.core/plugin.properties 2010-05-16 21:37:40 UTC (rev 22105)
@@ -10,4 +10,6 @@
Maven_Portlet_1_0_Libraries=Maven Portlet 1.0 Libraries
Maven_Portlet_2_0_Libraries=Maven Portlet 2.0 Libraries
Maven_Portletbridge_2_0_0_ALPHA_Libraries=Maven Portletbridge 2.0.0 ALPHA Libraries
-Maven_Portletbridge_2_0_0_ALPHA_Libraries_with_Dependencies=Maven Portletbridge 2.0.0 ALPHA Libraries with Dependencies
\ No newline at end of file
+Maven_Portletbridge_2_0_0_ALPHA_Libraries_with_Dependencies=Maven Portletbridge 2.0.0 ALPHA Libraries with Dependencies
+Maven_Portletbridge_2_0_0_FINAL_Libraries=Maven Portletbridge 2.0.0 FINAL Libraries
+Maven_Portletbridge_2_0_0_FINAL_Libraries_with_Dependencies=Maven Portletbridge 2.0.0 FINAL Libraries with Dependencies
\ No newline at end of file
Modified: trunk/maven/plugins/org.jboss.tools.maven.core/plugin.xml
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.core/plugin.xml 2010-05-15 14:51:11 UTC (rev 22104)
+++ trunk/maven/plugins/org.jboss.tools.maven.core/plugin.xml 2010-05-16 21:37:40 UTC (rev 22105)
@@ -185,4 +185,36 @@
</enablement>
</provider>
</extension>
+ <extension point="org.eclipse.jst.common.project.facet.core.libraryProviders">
+ <provider id="portletbridge200final-maven-library-provider" extends="maven-library-provider">
+ <label>%Maven_Portletbridge_2_0_0_FINAL_Libraries</label>
+ <param name="template" value="platform:/plugin/org.jboss.tools.maven.core/poms/portletbridge-template200final.xml"/>
+ <enablement>
+ <and>
+ <with variable="projectFacets">
+ <test property="org.jboss.tools.maven.core.projectFacets" value="jboss.jsfportlet,jboss.m2" forcePluginActivation="true"/>
+ </with>
+ <with variable="requestingProjectFacet">
+ <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jboss.jsfportlet:1.0" forcePluginActivation="true"/>
+ </with>
+ </and>
+ </enablement>
+ </provider>
+ </extension>
+ <extension point="org.eclipse.jst.common.project.facet.core.libraryProviders">
+ <provider id="portletbridge200finaldep-maven-library-provider" extends="maven-library-provider">
+ <label>%Maven_Portletbridge_2_0_0_FINAL_Libraries_with_Dependencies</label>
+ <param name="template" value="platform:/plugin/org.jboss.tools.maven.core/poms/portletbridge-template200finaldep.xml"/>
+ <enablement>
+ <and>
+ <with variable="projectFacets">
+ <test property="org.jboss.tools.maven.core.projectFacets" value="jboss.jsfportlet,jboss.m2" forcePluginActivation="true"/>
+ </with>
+ <with variable="requestingProjectFacet">
+ <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jboss.jsfportlet:1.0" forcePluginActivation="true"/>
+ </with>
+ </and>
+ </enablement>
+ </provider>
+ </extension>
</plugin>
Added: trunk/maven/plugins/org.jboss.tools.maven.core/poms/portletbridge-template200final.xml
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.core/poms/portletbridge-template200final.xml (rev 0)
+++ trunk/maven/plugins/org.jboss.tools.maven.core/poms/portletbridge-template200final.xml 2010-05-16 21:37:40 UTC (rev 22105)
@@ -0,0 +1,52 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>template</groupId>
+ <artifactId>template</artifactId>
+ <packaging>pom</packaging>
+ <version>0.0.1-SNAPSHOT</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.portletbridge</groupId>
+ <artifactId>portletbridge-api</artifactId>
+ <version>2.0.0.FINAL</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.portletbridge</groupId>
+ <artifactId>portletbridge-impl</artifactId>
+ <version>2.0.0.FINAL</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ </exclusion>
+
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ </dependencies>
+</project>
\ No newline at end of file
Added: trunk/maven/plugins/org.jboss.tools.maven.core/poms/portletbridge-template200finaldep.xml
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.core/poms/portletbridge-template200finaldep.xml (rev 0)
+++ trunk/maven/plugins/org.jboss.tools.maven.core/poms/portletbridge-template200finaldep.xml 2010-05-16 21:37:40 UTC (rev 22105)
@@ -0,0 +1,117 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>template</groupId>
+ <artifactId>template</artifactId>
+ <packaging>pom</packaging>
+ <version>0.0.1-SNAPSHOT</version>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>javax.portlet</groupId>
+ <artifactId>portlet-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+
+ <dependency>
+ <groupId>org.jboss.portletbridge</groupId>
+ <artifactId>portletbridge-api</artifactId>
+ <version>2.0.0.FINAL</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.portletbridge</groupId>
+ <artifactId>portletbridge-impl</artifactId>
+ <version>2.0.0.FINAL</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ </exclusion>
+
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui</artifactId>
+ <version>3.3.3.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-api</artifactId>
+ <version>3.3.3.Final</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-impl</artifactId>
+ <version>3.3.3.Final</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </exclusion>
+
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.facelets</groupId>
+ <artifactId>jsf-facelets</artifactId>
+ <version>1.1.15.B1</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
15 years, 11 months
- 1
- 0