JBoss Tools SVN: r23753 - trunk/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-07-27 16:22:00 -0400 (Tue, 27 Jul 2010)
New Revision: 23753
Modified:
trunk/build/parent/pom.xml
Log:
minor issues are fixed in build/parent/pom.xml:
1. Error during using ant-contrib in maven-ant-plugin
2. helios-jboss-mirror repo definition merged from parent-pom.xml in project root
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2010-07-27 20:06:22 UTC (rev 23752)
+++ trunk/build/parent/pom.xml 2010-07-27 20:22:00 UTC (rev 23753)
@@ -181,6 +181,17 @@
</activation>
<repositories>
<repository>
+ <id>helios-jboss-mirror</id>
+ <url>http://download.jboss.org/jbosstools/updates/helios/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
<id>helios</id>
<url>http://download.eclipse.org/releases/helios/</url>
<layout>p2</layout>
@@ -544,6 +555,12 @@
<groupId>ant-contrib</groupId>
<artifactId>ant-contrib</artifactId>
<version>1.0b3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
<executions>
@@ -600,6 +617,19 @@
<build>
<plugins>
<plugin>
+ <dependencies>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.3</version>
<executions>
@@ -611,13 +641,19 @@
</goals>
<configuration>
<tasks>
- <property file="requirements.properties" />
- <echo>Requirements build</echo>
- <ant dir="${basedir}/../../../requirements" inheritAll="true" >
- <property name="requirements" value="${requirements}" />
- <property name="settings.offline" value="${settings.offline}" />
- <property name="skipDownload" value="${skipDownload}" />
- </ant>
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties" />
+ <if>
+ <available file="${requirements.root}" type="dir" />
+ <then>
+ <property file="requirements.properties" />
+ <echo>Requirements build</echo>
+ <ant dir="${requirements.root}" inheritAll="true" >
+ <property name="requirements" value="${requirements}" />
+ <property name="settings.offline" value="${settings.offline}" />
+ <property name="skipDownload" value="${skipDownload}" />
+ </ant>
+ </then>
+ </if>
</tasks>
</configuration>
</execution>
13 years, 10 months
- 1
- 0
JBoss Tools SVN: r23752 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui: src/org/jboss/tools/deltacloud/ui/views and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: jjohnstn
Date: 2010-07-27 16:06:22 -0400 (Tue, 27 Jul 2010)
New Revision: 23752
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVCategoryElement.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVCloudElement.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVInstanceElement.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CloudViewContentProvider.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstancePropertySource.java
Log:
2010-07-27 Jeff Johnston <jjohnstn(a)redhat.com>
* src/org/jboss/tools/deltacloud/ui/views/CloudViewContentProvider.java (createElements): Add
viewer argument and use this when creating a CVCloudElement.
(inputChanged): Pass the viewer to createElements.
* src/org/jboss/tools/deltacloud/ui/views/CVCategoryElement.java: Remove unused import.
* src/org/jboss/tools/deltacloud/ui/views/CVCloudElement.java (getViewer): New method.
(CVCloudElement): Pass in the viewer for possible property refreshing.
* src/org/jboss/tools/deltacloud/ui/views/CVInstanceElement.java (getPropertySource):
* src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java (handleSelection): New method.
(createPartControl): Add call to hookSelection method.
(.selectionChanged): New method to allow us to do proper context menus.
(hookSelection): New method.
* src/org/jboss/tools/deltacloud/ui/views/InstancePropertySource.java (InstancePropertySource):
Pass in the CVInstanceElement this belongs to.
(getPropertyValue):
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-07-27 19:50:41 UTC (rev 23751)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-07-27 20:06:22 UTC (rev 23752)
@@ -1,3 +1,20 @@
+2010-07-27 Jeff Johnston <jjohnstn(a)redhat.com>
+
+ * src/org/jboss/tools/deltacloud/ui/views/CloudViewContentProvider.java (createElements): Add
+ viewer argument and use this when creating a CVCloudElement.
+ (inputChanged): Pass the viewer to createElements.
+ * src/org/jboss/tools/deltacloud/ui/views/CVCategoryElement.java: Remove unused import.
+ * src/org/jboss/tools/deltacloud/ui/views/CVCloudElement.java (getViewer): New method.
+ (CVCloudElement): Pass in the viewer for possible property refreshing.
+ * src/org/jboss/tools/deltacloud/ui/views/CVInstanceElement.java (getPropertySource):
+ * src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java (handleSelection): New method.
+ (createPartControl): Add call to hookSelection method.
+ (.selectionChanged): New method to allow us to do proper context menus.
+ (hookSelection): New method.
+ * src/org/jboss/tools/deltacloud/ui/views/InstancePropertySource.java (InstancePropertySource):
+ Pass in the CVInstanceElement this belongs to.
+ (getPropertyValue):
+
2010-07-26 Jeff Johnston <jjohnstn(a)redhat.com>
* src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties: Add support for hardware
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVCategoryElement.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVCategoryElement.java 2010-07-27 19:50:41 UTC (rev 23751)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVCategoryElement.java 2010-07-27 20:06:22 UTC (rev 23752)
@@ -1,7 +1,5 @@
package org.jboss.tools.deltacloud.ui.views;
-import java.util.ArrayList;
-
import org.eclipse.ui.views.properties.IPropertySource;
import org.jboss.tools.deltacloud.core.DeltaCloud;
import org.jboss.tools.deltacloud.core.DeltaCloudImage;
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVCloudElement.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVCloudElement.java 2010-07-27 19:50:41 UTC (rev 23751)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVCloudElement.java 2010-07-27 20:06:22 UTC (rev 23752)
@@ -1,13 +1,21 @@
package org.jboss.tools.deltacloud.ui.views;
+import org.eclipse.jface.viewers.Viewer;
import org.eclipse.ui.views.properties.IPropertySource;
public class CVCloudElement extends CloudViewElement {
- public CVCloudElement(Object element, String name) {
+ private Viewer viewer;
+
+ public CVCloudElement(Object element, String name, Viewer viewer) {
super(element, name);
+ this.viewer = viewer;
}
+ public Viewer getViewer() {
+ return viewer;
+ }
+
@Override
public IPropertySource getPropertySource() {
return new CloudPropertySource(getElement());
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVInstanceElement.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVInstanceElement.java 2010-07-27 19:50:41 UTC (rev 23751)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVInstanceElement.java 2010-07-27 20:06:22 UTC (rev 23752)
@@ -10,7 +10,7 @@
@Override
public IPropertySource getPropertySource() {
- return new InstancePropertySource(getElement());
+ return new InstancePropertySource(this, getElement());
}
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CloudViewContentProvider.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CloudViewContentProvider.java 2010-07-27 19:50:41 UTC (rev 23751)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CloudViewContentProvider.java 2010-07-27 20:06:22 UTC (rev 23752)
@@ -45,13 +45,13 @@
}
- private void createElements() {
+ private void createElements(Viewer viewer) {
ArrayList<CloudViewElement> list = new ArrayList<CloudViewElement>();
DeltaCloudManager m = DeltaCloudManager.getDefault();
DeltaCloud[] clouds = m.getClouds();
for (int i = 0; i < clouds.length; ++i) {
DeltaCloud cloud = clouds[i];
- CVCloudElement e = new CVCloudElement(cloud, cloud.getName());
+ CVCloudElement e = new CVCloudElement(cloud, cloud.getName(), viewer);
CVCategoryElement c1 = new CVCategoryElement(cloud, CVMessages.getString(INSTANCE_CATEGORY_NAME),
CVCategoryElement.INSTANCES);
CVCategoryElement c2 = new CVCategoryElement(cloud, CVMessages.getString(IMAGE_CATEGORY_NAME),
@@ -65,7 +65,7 @@
@Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- createElements();
+ createElements(viewer);
}
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java 2010-07-27 19:50:41 UTC (rev 23751)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java 2010-07-27 20:06:22 UTC (rev 23752)
@@ -11,7 +11,9 @@
import org.eclipse.jface.viewers.DoubleClickEvent;
import org.eclipse.jface.viewers.IDoubleClickListener;
import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
@@ -64,9 +66,19 @@
makeActions();
hookContextMenu();
hookDoubleClickAction();
+ hookSelection();
contributeToActionBars();
}
+ private void hookSelection() {
+ viewer.addSelectionChangedListener(new ISelectionChangedListener() {
+ @Override
+ public void selectionChanged(SelectionChangedEvent event) {
+ handleSelection();
+ }
+ });
+ }
+
private void hookContextMenu() {
MenuManager menuMgr = new MenuManager("#PopupMenu");
menuMgr.setRemoveAllWhenShown(true);
@@ -86,6 +98,12 @@
fillLocalToolBar(bars.getToolBarManager());
}
+ private void handleSelection() {
+ IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
+ CloudViewElement element = (CloudViewElement)selection.getFirstElement();
+ // FIXME: add context menus here based on element type
+ }
+
private void fillLocalPullDown(IMenuManager manager) {
manager.add(action1);
manager.add(new Separator());
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstancePropertySource.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstancePropertySource.java 2010-07-27 19:50:41 UTC (rev 23751)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstancePropertySource.java 2010-07-27 20:06:22 UTC (rev 23752)
@@ -11,7 +11,7 @@
private static final String PROPERTY_NAME = "deltacloud.views.instance.name"; //$NON-NLS-1$
private static final String PROPERTY_ID = "deltacloud.views.instance.id"; //$NON-NLS-1$
- private static final String PROPERTY_STATE = "deltacloud.views.instance.state"; //$NON-NLS-1$
+ public static final String PROPERTY_STATE = "deltacloud.views.instance.state"; //$NON-NLS-1$
private static final String PROPERTY_HOSTNAME = "deltacloud.views.instance.hostname"; //$NON-NLS-1$
private static final String PROPERTY_PROFILEID = "deltacloud.views.instance.profileid"; //$NON-NLS-1$
private static final String PROPERTY_REALMID = "deltacloud.views.instance.realmid"; //$NON-NLS-1$
@@ -26,9 +26,11 @@
private IPropertyDescriptor[] propertyDescriptors;
private DeltaCloudInstance instance;
+ private CVInstanceElement element;
- public InstancePropertySource(Object o) {
+ public InstancePropertySource(CVInstanceElement element, Object o) {
instance = (DeltaCloudInstance)o;
+ this.element = element;
}
@Override
@@ -80,8 +82,9 @@
return instance.getRealmId();
if (id.equals(PROPERTY_IMAGEID))
return instance.getImageId();
- if (id.equals(PROPERTY_STATE))
+ if (id.equals(PROPERTY_STATE)) {
return instance.getState();
+ }
if (id.equals(PROPERTY_HOSTNAME)) {
List<String> hostnames = instance.getHostNames();
if (hostnames.size() >= 1)
13 years, 10 months
- 1
- 0
JBoss Tools SVN: r23751 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core: src/org/jboss/tools/deltacloud/core/client and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: jjohnstn
Date: 2010-07-27 15:50:41 -0400 (Tue, 27 Jul 2010)
New Revision: 23751
Added:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Property.java
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/HardwareProfile.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Instance.java
Log:
2010-07-27 Jeff Johnston <jjohnstn(a)redhat.com>
* src/org/jboss/tools/deltacloud/core/client/Property.java: New file.
* src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java (getProfileProperties): Renamed
from setProfileProperties and cpu support added.
(buildDeltaCloudObject): Add support for HardwareProfile.
(buildHardwareProfile): New method to build up a hardware profile.
(buildInstance): Add hardware profile support.
(createInstance): Change to use getProfileProperties which was renamed.
* src/org/jboss/tools/deltacloud/core/client/HardwareProfile.java (getArchitecture): New method.
(getNamedProperty): Ditto.
(getCPU): Ditto.
(toString): Ditto.
(getProperties): Ditto.
(getMemory): Change to get the memory property.
(getStorage): Change to get the storage property.
(HardwareProfile): Make private.
* src/org/jboss/tools/deltacloud/core/client/Instance.java (setCPU): New method.
(getCPU): Ditto.
(toString): Add cpu support.
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-07-27 18:57:21 UTC (rev 23750)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-07-27 19:50:41 UTC (rev 23751)
@@ -1,3 +1,24 @@
+2010-07-27 Jeff Johnston <jjohnstn(a)redhat.com>
+
+ * src/org/jboss/tools/deltacloud/core/client/Property.java: New file.
+ * src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java (getProfileProperties): Renamed
+ from setProfileProperties and cpu support added.
+ (buildDeltaCloudObject): Add support for HardwareProfile.
+ (buildHardwareProfile): New method to build up a hardware profile.
+ (buildInstance): Add hardware profile support.
+ (createInstance): Change to use getProfileProperties which was renamed.
+ * src/org/jboss/tools/deltacloud/core/client/HardwareProfile.java (getArchitecture): New method.
+ (getNamedProperty): Ditto.
+ (getCPU): Ditto.
+ (toString): Ditto.
+ (getProperties): Ditto.
+ (getMemory): Change to get the memory property.
+ (getStorage): Change to get the storage property.
+ (HardwareProfile): Make private.
+ * src/org/jboss/tools/deltacloud/core/client/Instance.java (setCPU): New method.
+ (getCPU): Ditto.
+ (toString): Add cpu support.
+
2010-07-26 Jeff Johnston <jjohnstn(a)redhat.com>
* src/org/jboss/tools/deltacloud/core/client/AddressList.java: New file.
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java 2010-07-27 18:57:21 UTC (rev 23750)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java 2010-07-27 19:50:41 UTC (rev 23751)
@@ -154,9 +154,9 @@
}
@Override
- public Instance createInstance(String imageId, String flavorId, String realmId, String name) throws DeltaCloudClientException
+ public Instance createInstance(String imageId, String profileId, String realmId, String name) throws DeltaCloudClientException
{
- String query = "?image_id=" + imageId + "&flavor_id=" + flavorId + "&realm_id=" + realmId + "&name=" + name + "&commit=create";
+ String query = "?image_id=" + imageId + "&hardware_profile_id=" + profileId + "&realm_id=" + realmId + "&name=" + name + "&commit=create";
return buildInstance(sendRequest(DCNS.INSTANCES + query, RequestType.POST));
}
@@ -245,7 +245,7 @@
instance.setImageId(getIdFromHref(getAttributeValues(document, "image", "href").get(0)));
instance.setProfileId(getIdFromHref(getAttributeValues(document, "hardware-profile", "href").get(0)));
- setProfileProperties(instance, getPropertyNodes(document, "hardware-profile"));
+ getProfileProperties(instance, getPropertyNodes(document, "hardware-profile"));
instance.setRealmId(getIdFromHref(getAttributeValues(document, "realm", "href").get(0)));
instance.setState(getElementText(document, "state").get(0));
@@ -264,7 +264,62 @@
}
return null;
}
-
+
+ private HardwareProfile buildHardwareProfile(String xml)
+ {
+ try
+ {
+ HardwareProfile profile = JAXB.unmarshal(new StringReader(xml), HardwareProfile.class);
+
+ DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+ DocumentBuilder db = dbf.newDocumentBuilder();
+ Document document = db.parse(new InputSource(new StringReader(xml)));
+
+ List<Node> nodes = getPropertyNodes(document, "hardware-profile");
+
+ for (Node n : nodes) {
+ Property p = new Property();
+ p.setName(n.getAttributes().getNamedItem("name").getNodeValue());
+ p.setValue(n.getAttributes().getNamedItem("value").getNodeValue());
+ p.setUnit(n.getAttributes().getNamedItem("unit").getNodeValue());
+ p.setKind(n.getAttributes().getNamedItem("kind").getNodeValue());
+ if (p.getKind().equals("range")) {
+ NodeList children = n.getChildNodes();
+ for (int i = 0; i < children.getLength(); ++i) {
+ Node child = children.item(i);
+ if (child.getNodeName().equals("range")) {
+ String first = child.getAttributes().getNamedItem("first").getNodeValue();
+ String last = child.getAttributes().getNamedItem("last").getNodeValue();
+ p.setRange(first, last);
+ }
+ }
+ }
+ else if (p.getKind().equals("enum")) {
+ ArrayList<String> enums = new ArrayList<String>();
+ NodeList children = n.getChildNodes();
+ for (int i = 0; i < children.getLength(); ++i) {
+ Node child = children.item(i);
+ if (child.getNodeName().equals("enum")) {
+ NodeList enumChildren = child.getChildNodes();
+ for (int j = 0; j < enumChildren.getLength(); ++j) {
+ Node enumChild = enumChildren.item(j);
+ enums.add(enumChild.getAttributes().getNamedItem("value").getNodeValue());
+ }
+ }
+ }
+ p.setEnums(enums);
+ }
+ profile.getProperties().add(p);
+ }
+ return profile;
+ }
+ catch(Exception e)
+ {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
private List<String> getAttributeValues(Document document, String elementName, String attributeName)
{
NodeList elements = document.getElementsByTagName(elementName);
@@ -305,7 +360,7 @@
return values;
}
- private void setProfileProperties(Instance instance, List<Node> propertyNodes) {
+ private void getProfileProperties(Instance instance, List<Node> propertyNodes) {
if (propertyNodes != null) {
for (Iterator<Node> i = propertyNodes.iterator(); i.hasNext();) {
Node n = i.next();
@@ -323,6 +378,9 @@
storage += " " + attrs.getNamedItem("unit").getNodeValue(); //$NON-NLS-1$
}
instance.setStorage(storage);
+ } else if (name.equals("cpu")) { //$NON-NLS-1$
+ String cpu = attrs.getNamedItem("value").getNodeValue(); //$NON-NLS-1$
+ instance.setCPU(cpu);
}
}
}
@@ -366,6 +424,10 @@
{
return (T) buildInstance(nodeToString(node));
}
+ else if (clazz.equals(HardwareProfile.class))
+ {
+ return (T) buildHardwareProfile(nodeToString(node));
+ }
else
{
return JAXB.unmarshal(new StringReader(nodeToString(node)), clazz);
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/HardwareProfile.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/HardwareProfile.java 2010-07-27 18:57:21 UTC (rev 23750)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/HardwareProfile.java 2010-07-27 19:50:41 UTC (rev 23751)
@@ -1,65 +1,73 @@
package org.jboss.tools.deltacloud.core.client;
-import javax.xml.bind.annotation.XmlElement;
+import java.util.ArrayList;
+import java.util.List;
public class HardwareProfile extends DeltaCloudObject
{
private static final long serialVersionUID = 1L;
- @XmlElement
- private String architecture;
+ private List<Property> properties;
- @XmlElement
- private String memory;
-
- @XmlElement
- private String storage;
-
private HardwareProfile()
{
}
- @SuppressWarnings("unused")
- private void setArchitecture(String architecture)
- {
- this.architecture = architecture;
+ public List<Property> getProperties() {
+ if (properties == null)
+ properties = new ArrayList<Property>();
+ return properties;
}
-
- @SuppressWarnings("unused")
- private void setMemory(String memory)
- {
- this.memory = memory;
+
+ private Property getNamedProperty(String name) {
+ for (Property p : properties) {
+ if (p.getName().equals(name))
+ return p;
+ }
+ return null;
}
-
- @SuppressWarnings("unused")
- private void setStorage(String storage)
- {
- this.storage = storage;
- }
-
+
public String getArchitecture()
{
- return architecture;
+ Property p = getNamedProperty("architecture");
+ if (p != null)
+ return p.toString();
+ return null;
}
public String getMemory()
{
- return memory;
+ Property p = getNamedProperty("memory");
+ if (p != null)
+ return p.toString();
+ return null;
}
-
+
public String getStorage()
{
- return storage;
+ Property p = getNamedProperty("storage");
+ if (p != null)
+ return p.toString();
+ return null;
}
+
+ public String getCPU()
+ {
+ Property p = getNamedProperty("cpu");
+ if (p != null)
+ return p.toString();
+ return null;
+ }
+
@Override
public String toString()
{
String s = "";
s += "Hardware-profile:\t\t" + getId() + "\n";
- s += "Arch:\t\t" + getArchitecture() + "\n";
- s += "Memory:\t\t" + getMemory() + "\n";
- s += "Storage:\t" + getStorage() + "\n";
+ for (Property p : properties) {
+ s += p.getName() + ":\t\t" + p.getValue() + "\n";
+ }
return s;
}
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Instance.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Instance.java 2010-07-27 18:57:21 UTC (rev 23750)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Instance.java 2010-07-27 19:50:41 UTC (rev 23751)
@@ -20,13 +20,14 @@
private String imageId;
- @XmlElement(name="hardware-profile")
private String profileId;
private String memory;
private String storage;
+ private String cpu;
+
private String realmId;
@XmlElement
@@ -73,6 +74,10 @@
protected void setStorage(String storage) {
this.storage = storage;
}
+
+ protected void setCPU(String cpu) {
+ this.cpu = cpu;
+ }
protected void setRealmId(String realmId)
{
@@ -128,7 +133,11 @@
public String getStorage() {
return storage;
}
-
+
+ public String getCPU() {
+ return cpu;
+ }
+
public String getRealmId()
{
return realmId;
@@ -164,10 +173,13 @@
s += "Realm:\t\t" + getRealmId() + "\n";
s += "Profile:\t\t" + getProfileId() + "\n";
if (getMemory() != null)
- s += "Memory:\t\t\t" + getMemory() + "\n";
+ s += "Memory:\t\t" + getMemory() + "\n";
if (getStorage() != null) {
- s += "Storage:\t\t\t" + getStorage() + "\n";
+ s += "Storage:\t\t" + getStorage() + "\n";
}
+ if (getCPU() != null) {
+ s += "CPU:\t\t" + getCPU() + "\n";
+ }
s += "State:\t\t" + getState() + "\n";
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Property.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Property.java (rev 0)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Property.java 2010-07-27 19:50:41 UTC (rev 23751)
@@ -0,0 +1,93 @@
+package org.jboss.tools.deltacloud.core.client;
+
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlElement;
+
+public class Property extends DeltaCloudObject {
+
+ private static final long serialVersionUID = 1L;
+
+ public static enum Kind {FIXED, RANGE, ENUM};
+
+ public Property()
+ {
+ }
+
+ @XmlElement
+ private String kind;
+
+ @XmlElement
+ private String unit;
+
+ @XmlElement
+ private String name;
+
+ @XmlElement
+ private String value;
+
+ // For range
+ private String first;
+ private String last;
+
+ // For enum
+ private List<String> enums;
+
+ public String getKind() {
+ return kind;
+ }
+
+ public String getUnit() {
+ return unit;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ public void setUnit(String unit) {
+ this.unit = unit;
+ }
+
+ public void setKind(String kind) {
+ this.kind = kind;
+ }
+
+ public void setRange(String first, String last) {
+ this.first = first;
+ this.last = last;
+ }
+
+ public void setEnums(List<String> enums) {
+ this.enums = enums;
+ }
+
+ public String toString() {
+ if (kind.equals("range")) {
+ return first += "-" + last + "(default:" + value + ")";
+ }
+ else if (kind.equals("enum")) {
+ String s = enums.get(0);
+ for (int i = 1; i < enums.size(); ++i) {
+ s += ", " + enums.get(i);
+ }
+ s += " (default:" + value + ")";
+ return s;
+ }
+ // must be "fixed"
+ return value += " " + unit;
+ }
+
+}
13 years, 10 months
- 1
- 0
JBoss Tools SVN: r23750 - workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-07-27 14:57:21 -0400 (Tue, 27 Jul 2010)
New Revision: 23750
Modified:
workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentModuleOptionCompositeAssistant.java
workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ModuleDeploymentPage.java
workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSection.java
Log:
JBIDE-6580 - small editor change so that modifying from local to RSE can also invalidate the metadata option
Modified: workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentModuleOptionCompositeAssistant.java
===================================================================
--- workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentModuleOptionCompositeAssistant.java 2010-07-27 18:31:35 UTC (rev 23749)
+++ workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentModuleOptionCompositeAssistant.java 2010-07-27 18:57:21 UTC (rev 23750)
@@ -10,6 +10,8 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.ui.editor;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
import java.io.File;
import org.eclipse.core.runtime.NullProgressMonitor;
@@ -49,6 +51,7 @@
import org.eclipse.ui.forms.widgets.Section;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IRuntime;
+import org.eclipse.wst.server.core.IServerWorkingCopy;
import org.eclipse.wst.server.ui.ServerUICore;
import org.eclipse.wst.server.ui.internal.command.ServerCommand;
import org.jboss.ide.eclipse.as.core.ExtensionManager;
@@ -56,17 +59,15 @@
import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants;
-import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethodType;
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublisher;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper;
import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader.DeploymentModulePrefs;
import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader.DeploymentPreferences;
-import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
import org.jboss.ide.eclipse.as.ui.Messages;
-public class DeploymentModuleOptionCompositeAssistant {
+public class DeploymentModuleOptionCompositeAssistant implements PropertyChangeListener {
private ModuleDeploymentPage page;
private DeploymentPreferences preferences;
private TreeViewer viewer;
@@ -74,7 +75,9 @@
protected String COLUMN_LOC;
protected String COLUMN_TEMP_LOC;
protected String currentDeployType;
-
+
+ private IServerWorkingCopy lastWC;
+
public DeploymentModuleOptionCompositeAssistant() {
COLUMN_NAME = IJBossToolingConstants.LOCAL_DEPLOYMENT_NAME;
COLUMN_LOC = IJBossToolingConstants.LOCAL_DEPLOYMENT_LOC;
@@ -166,16 +169,14 @@
}
public void widgetSelected(SelectionEvent e) {
- if (e.getSource() == currentSelection)
- return; // do nothing
- page.execute(new RadioClickedCommand((Button) e.getSource(),
- currentSelection));
- currentSelection = (Button) e.getSource();
+ radioSelected(e.getSource());
}
};
metadataRadio.addSelectionListener(radioListener);
serverRadio.addSelectionListener(radioListener);
customRadio.addSelectionListener(radioListener);
+ lastWC = page.getServer();
+ lastWC.addPropertyChangeListener(this);
}
FormData radios = new FormData();
@@ -318,7 +319,14 @@
page.getSaveStatus();
return section;
}
-
+
+ protected void radioSelected(Object c) {
+ if (c == currentSelection)
+ return; // do nothing
+ page.execute(new RadioClickedCommand((Button)c, currentSelection));
+ currentSelection = (Button)c;
+ }
+
protected boolean isZippedPublisherAvailable() {
/*
* Maybe use IJBossServerPublishMethodType type = DeploymentPreferenceLoader.getCurrentDeploymentMethodType(getServer());
@@ -714,4 +722,25 @@
}
}
+ public void updateListeners() {
+ // server has been saved. Remove property change listener from last wc and add to newest
+ lastWC.removePropertyChangeListener(this);
+ lastWC = page.getServer();
+ lastWC.addPropertyChangeListener(this);
+ }
+
+ @Override
+ public void propertyChange(PropertyChangeEvent evt) {
+ if( evt.getPropertyName().equals( IDeployableServer.SERVER_MODE)) {
+ metadataRadio.setEnabled(evt.getNewValue().equals(LocalPublishMethod.LOCAL_PUBLISH_METHOD));
+ String originalDeployLocation = page.getServer().getOriginal().getAttribute(IDeployableServer.DEPLOY_DIRECTORY_TYPE, IDeployableServer.DEPLOY_CUSTOM);
+ String wcDeployLocation = page.getServer().getAttribute(IDeployableServer.DEPLOY_DIRECTORY_TYPE, IDeployableServer.DEPLOY_CUSTOM);
+ if(!metadataRadio.isEnabled() && metadataRadio.getSelection()) {
+ metadataRadio.setSelection(false);
+ serverRadio.setSelection(true);
+ radioSelected(serverRadio);
+ int x = 3; x++;
+ }
+ }
+ }
}
Modified: workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ModuleDeploymentPage.java
===================================================================
--- workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ModuleDeploymentPage.java 2010-07-27 18:31:35 UTC (rev 23749)
+++ workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ModuleDeploymentPage.java 2010-07-27 18:57:21 UTC (rev 23750)
@@ -50,6 +50,7 @@
protected ArrayList<IModule> possibleModules;
protected DeploymentPreferences preferences;
protected ServerAttributeHelper helper;
+ protected DeploymentModuleOptionCompositeAssistant tab;
public ServerAttributeHelper getHelper() {
if( helper == null ) {
@@ -120,7 +121,7 @@
}
private void addDeploymentLocationControls(Composite parent, Control top) {
- DeploymentModuleOptionCompositeAssistant tab = new DeploymentModuleOptionCompositeAssistant();
+ tab = new DeploymentModuleOptionCompositeAssistant();
tab.setDeploymentPage(this);
tab.setDeploymentPrefs(preferences);
Composite defaultComposite = tab.createDefaultComposite(parent);
@@ -224,10 +225,11 @@
// Currently inactive!!! See bug 286699
public void doSave(IProgressMonitor monitor) {
- try {
- DeploymentPreferenceLoader.savePreferences(server.getOriginal(), preferences);
- } catch( IOException ioe ) {
- // TODO eh?
- }
+ tab.updateListeners();
+// try {
+// DeploymentPreferenceLoader.savePreferences(server.getOriginal(), preferences);
+// } catch( IOException ioe ) {
+// // TODO eh?
+// }
}
}
Modified: workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSection.java
===================================================================
--- workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSection.java 2010-07-27 18:31:35 UTC (rev 23749)
+++ workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSection.java 2010-07-27 18:57:21 UTC (rev 23750)
@@ -34,6 +34,7 @@
import org.eclipse.wst.server.ui.internal.editor.ServerEditorPartInput;
import org.eclipse.wst.server.ui.internal.editor.ServerResourceCommandManager;
import org.jboss.ide.eclipse.as.core.ExtensionManager;
+import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethodType;
import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
@@ -175,7 +176,7 @@
this.server = server;
this.key = key;
this.newVal = val;
- this.oldVal = server.getAttribute(key, "local");
+ this.oldVal = server.getAttribute(key, LocalPublishMethod.LOCAL_PUBLISH_METHOD);
}
public void execute() {
server.setAttribute(key, newVal);
13 years, 10 months
- 1
- 0
JBoss Tools SVN: r23749 - /.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-07-27 14:31:35 -0400 (Tue, 27 Jul 2010)
New Revision: 23749
Removed:
org.jboss.tools.seam.text.ext.test/
Log:
Deleted plug-in located outside trunk. https://jira.jboss.org/browse/JBIDE-6688
13 years, 10 months
- 1
- 0
JBoss Tools SVN: r23748 - in trunk/build: parent and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-07-27 13:37:48 -0400 (Tue, 27 Jul 2010)
New Revision: 23748
Added:
trunk/build/parent/
trunk/build/parent/pom.xml
trunk/build/pom.xml
Log:
copy of parent pom and aggregator project to build module before removing pom.xml and parent-pom.xml from project root
Added: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml (rev 0)
+++ trunk/build/parent/pom.xml 2010-07-27 17:37:48 UTC (rev 23748)
@@ -0,0 +1,675 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.parent.pom</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <name>JBoss Tools Parent</name>
+ <packaging>pom</packaging>
+
+ <properties>
+ <!-- <tychoVersion>0.10.0-SNAPSHOT</tychoVersion> -->
+ <tychoVersion>0.9.0</tychoVersion>
+ <scmBranch>trunk</scmBranch>
+ <BUILD_ALIAS>M2</BUILD_ALIAS>
+ <memoryOptions1>-Xms512m -Xmx1024m -XX:PermSize=256m</memoryOptions1>
+ <memoryOptions2>-XX:MaxPermSize=256m</memoryOptions2>
+ <systemProperties></systemProperties>
+ <target.platform>e36-wtp32</target.platform>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.4</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.sonatype.tycho</groupId>
+ <artifactId>maven-osgi-packaging-plugin</artifactId>
+ <version>${tychoVersion}</version>
+ <configuration>
+ <format>'v'yyyyMMdd-HHmm'-${BUILD_ALIAS}'</format>
+ <archiveSite>true</archiveSite>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.sonatype.tycho</groupId>
+ <artifactId>tycho-maven-plugin</artifactId>
+ <version>${tychoVersion}</version>
+ <extensions>true</extensions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.sonatype.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tychoVersion}</version>
+ <configuration>
+ <resolver>p2</resolver>
+ <ignoreTychoRepositories>true</ignoreTychoRepositories>
+ <environments>
+ <environment>
+ <os>macosx</os>
+ <ws>cocoa</ws>
+ <arch>x86</arch>
+ </environment>
+ <!-- <environment> <os>macosx</os> <ws>carbon</ws> <arch>x86</arch>
+ </environment> -->
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86_64</arch>
+ </environment>
+ </environments>
+ </configuration>
+ </plugin>
+
+ <!-- to skip running tests (compile only) use commandline flag: -Dmaven.test.skip
+ To allow all tests in a pom to pass/fail, use commandline flag: -fae (fail
+ at end) -->
+ <plugin>
+ <groupId>org.sonatype.tycho</groupId>
+ <artifactId>maven-osgi-test-plugin</artifactId>
+ <version>${tychoVersion}</version>
+ <configuration>
+ <!-- timeout in seconds -->
+ <surefire.timeout>1800</surefire.timeout>
+ <forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds>
+ <useUIHarness>true</useUIHarness>
+ <useUIThread>true</useUIThread>
+ <argLine>${memoryOptions1} ${memoryOptions2} ${systemProperties}
+ </argLine>
+ <!-- https://docs.sonatype.org/display/TYCHO/How+to+run+SWTBot+tests+with+Tycho -->
+ <!-- set useUIThread=true for regular ui tests -->
+ <!-- set useUIThread=false for swtbot tests (?) -->
+ <product>org.eclipse.sdk.ide</product>
+ <application>org.eclipse.ui.ide.workbench</application>
+ <dependencies>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.sdk.ide</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ <!-- http://www.jmock.org/maven.html -->
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock-legacy</artifactId>
+ <version>2.5.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock-junit4</artifactId>
+ <version>2.5.1</version>
+ </dependency>
+ </dependencies>
+ <includes>
+ <include>**/AllTests.class</include>
+ <include>**/*AllTests*.class</include>
+ <include>**/*AllBotTests*.class</include>
+ <include>**/*TestSuite*.class</include>
+ </includes>
+ <parallel>true</parallel>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbosstools/${scmBranch}
+ </connection>
+ <developerConnection>scm:svn:http://anonsvn.jboss.org/repos/jbosstools/${scmBranch}
+ </developerConnection>
+ <url>http://anonsvn.jboss.org/repos/jbosstools/${scmBranch}
+ </url>
+ </scm>
+
+ <issueManagement>
+ <system>jira</system>
+ <url>https://jira.jboss.org/jira/secure/</url>
+ </issueManagement>
+ <profiles>
+ <profile>
+ <id>helios</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <target.platform>e36-wtp32</target.platform>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.sonatype.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tychoVersion}</version>
+ <configuration>
+ <target>
+ <artifact>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>target-platform</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <classifier>${target.platform}</classifier>
+ </artifact>
+ </target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- Time saver: to build everything from scratch (without target platform);
+ To enable it use -P helios-no-target in command line.
+ Do not remove repos that contains the same artefacts, it is done for purpose
+ to make build more stable in case one of the repos is offline.
+ -->
+ <profile>
+ <id>helios-no-target</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <repositories>
+ <repository>
+ <id>helios</id>
+ <url>http://download.eclipse.org/releases/helios/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>webtools32</id>
+ <url>http://download.eclipse.org/webtools/repository/helios</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>eclipse36</id>
+ <url>http://download.eclipse.org/eclipse/updates/3.6.x/
+ </url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>birt26</id>
+ <url>http://download.eclipse.org/birt/update-site/2.6/
+ </url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>swtbot-helios</id>
+ <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/
+ </url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>m2eclipse</id>
+ <url>http://m2eclipse.sonatype.org/sites/m2e/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>m2eclipse-extras</id>
+ <url>http://m2eclipse.sonatype.org/sites/m2e-extras/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>orbit</id>
+ <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/u...
+ </url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>google eclipse plugins</id>
+ <url>http://dl.google.com/eclipse/plugin/3.6</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+ </profile>
+ <profile>
+ <id>hudson</id>
+ <activation>
+ <property>
+ <name>BUILD_NUMBER</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.sonatype.tycho</groupId>
+ <artifactId>maven-osgi-packaging-plugin</artifactId>
+ <version>${tychoVersion}</version>
+ <configuration>
+ <format>'v'yyyyMMdd-HHmm'-H${BUILD_NUMBER}-${BUILD_ALIAS}'
+ </format>
+ <archiveSite>true</archiveSite>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>svn-repos</id>
+ <repositories>
+ <repository>
+ <id>svnkit13</id>
+ <url>http://eclipse.svnkit.com/1.3.x/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>subclipse16</id>
+ <url>http://subclipse.tigris.org/update_1.6.x/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>subversive07</id>
+ <url>http://download.eclipse.org/technology/subversive/0.7/update-site/
+ </url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>subversive20</id>
+ <url>http://community.polarion.com/projects/subversive/download/eclipse/2.0/up...
+ </url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+ </profile>
+ <profile>
+ <id>galileo</id>
+ <repositories>
+ <repository>
+ <id>galileo</id>
+ <url>http://download.eclipse.org/releases/galileo/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>eclipse35</id>
+ <url>http://download.eclipse.org/eclipse/updates/3.5/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>birt25r</id>
+ <url>http://download.eclipse.org/birt/update-site/2.5</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>swtbot-galileo</id>
+ <url>http://download.eclipse.org/technology/swtbot/galileo/dev-build/update-site
+ </url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>webtools</id>
+ <url>http://download.eclipse.org/webtools/updates/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>orbit</id>
+ <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/u...
+ </url>
+ <layout>p2</layout>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+
+ <repository>
+ <id>m2eclipse</id>
+ <url>http://m2eclipse.sonatype.org/sites/m2e/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>m2eclipse-extras</id>
+ <url>http://m2eclipse.sonatype.org/sites/m2e-extras/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+ </profile>
+ <profile>
+ <id>coverage</id>
+ <activation>
+ <property>
+ <name>coverage</name>
+ </property>
+ </activation>
+ <properties>
+ <emma.session.out.file>${project.build.directory}/emma/coverage.es</emma.session.out.file>
+ <emma.filter />
+ <emma.instrument.bundles />
+ </properties>
+ <build>
+ <plugins>
+ <!-- plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>${emma.session.out.file}</file>
+ <type>es</type>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>2.3.1</version>
+ <configuration>
+ <file></file>
+ <groupId></groupId>
+ <artifactId></artifactId>
+ <version></version>
+ <packaging></packaging>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.sonatype.tycho</groupId>
+ <artifactId>maven-osgi-test-plugin</artifactId>
+ <version>${tychoVersion}</version>
+ <configuration>
+ <systemProperties combine.children="append">
+ <emma.session.out.file>${emma.session.out.file}</emma.session.out.file>
+ <emma.filter>${emma.filter}</emma.filter>
+ <eclemma.instrument.bundles>${emma.instrument.bundles}</eclemma.instrument.bundles>
+ </systemProperties>
+ <frameworkExtensions>
+ <frameworkExtension>
+ <groupId>org.eclemma.runtime.equinox</groupId>
+ <artifactId>org.eclemma.runtime.equinox</artifactId>
+ <version>1.1.0.200908261008</version>
+ </frameworkExtension>
+ </frameworkExtensions>
+ <application>org.eclipse.ui.ide.workbench</application>
+ <dependencies>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.sdk.ide</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ </dependencies>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.3</version>
+ <dependencies>
+ <dependency>
+ <groupId>emma</groupId>
+ <artifactId>emma_ant</artifactId>
+ <version>2.0.5312</version>
+ </dependency>
+ <dependency>
+ <groupId>emma</groupId>
+ <artifactId>emma</artifactId>
+ <version>2.0.5312</version>
+ </dependency>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b3</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>emma-report</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <taskdef resource="emma_ant.properties" />
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties" />
+ <if>
+ <available file="${project.build.directory}/emma" type="dir" />
+ <then>
+ <echo>Process emma report...</echo>
+ <!-- emma enabled="true">
+ <instr metadatafile="${project.build.directory}/coverage.em" mode="overwrite" instrpath="${project.build.directory}/../../../plugins/${emma.instrument.bundles}/target/classes" />
+ </emma-->
+ <emma enabled="true">
+ <report>
+ <infileset dir="${project.build.directory}/emma" includes="*.es,*.em" />
+ <txt outfile="${project.build.directory}/emma/coverage.txt" />
+ <xml outfile="${project.build.directory}/emma/coverage.xml" />
+ <html outfile="${project.build.directory}/emma/coverage.html" />
+ </report>
+ </emma>
+ <loadfile property="emma.txt"
+ srcFile="${project.build.directory}/emma/coverage.txt"
+ failonerror="false" />
+ <echo>${emma.txt}</echo>
+ </then>
+ </if>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>requirements</id>
+ <activation>
+ <file>
+ <exists>${basedir}/requirements.properties</exists>
+ </file>
+ </activation>
+ <properties>
+ <requirements.root>${basedir}/../../../requirements</requirements.root>
+ <requirement.build.root>${requirements.root}/target</requirement.build.root>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.3</version>
+ <executions>
+ <execution>
+ <id>download-plugin-requirements</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <property file="requirements.properties" />
+ <echo>Requirements build</echo>
+ <ant dir="${basedir}/../../../requirements" inheritAll="true" >
+ <property name="requirements" value="${requirements}" />
+ <property name="settings.offline" value="${settings.offline}" />
+ <property name="skipDownload" value="${skipDownload}" />
+ </ant>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>sonatype-maven-central</id>
+ <url>http://repository.sonatype.org/content/repositories/central/
+ </url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </pluginRepository>
+ <pluginRepository>
+ <id>maven-snapshots-sonatype</id>
+ <url>https://repository.apache.org/content/repositories/maven-snapshots-sonatype/
+ </url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </pluginRepository>
+ <pluginRepository>
+ <id>tycho</id>
+ <url>https://repository.sonatype.org/content/repositories/snapshots/
+ </url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </pluginRepository>
+ <pluginRepository>
+ <id>apache-snapshots</id>
+ <url>http://repository.apache.org/snapshots/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </pluginRepository>
+ </pluginRepositories>
+</project>
Added: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml (rev 0)
+++ trunk/build/pom.xml 2010-07-27 17:37:48 UTC (rev 23748)
@@ -0,0 +1,66 @@
+<project
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+<groupId>org.jboss</groupId>
+<artifactId>jbosstools</artifactId>
+<version>0.0.1-SNAPSHOT</version>
+<packaging>pom</packaging>
+<modules>
+ <module>../build/libs</module>
+
+ <!-- this order is important! make sure you've run genpom.xml first! -->
+ <!-- dgolovin's order -->
+ <module>../tests</module>
+ <module>../freemarker</module>
+ <module>../jmx</module>
+ <module>../archives</module>
+ <module>../as</module>
+ <module>../common</module>
+ <module>../jst</module>
+ <module>../xulrunner</module>
+ <module>../vpe</module>
+ <module>../jsf</module>
+
+ <module>../hibernatetools</module>
+ <module>../portlet</module>
+ <module>../workingset</module>
+
+ <module>../struts</module>
+
+ <module>../profiler</module>
+ <module>../smooks</module>
+ <module>../cdi</module>
+ <module>../birt</module>
+ <module>../bpel</module>
+ <module>../esb</module>
+ <module>../seam</module>
+ <module>../examples</module>
+ <module>../maven</module>
+ <module>../tptp</module>
+ <module>../ws</module>
+ <module>../modeshape</module>
+ <module>../flow</module>
+ <module>../jbpm</module>
+ <!-- NOTE: To build drools, must first bootstrap with ant script: cd drools;
+ ant -q -->
+ <!-- IF YOU REMOVE A MODULE, be sure to also remove it from site/site.xml and build/aggregate/site/site.xml
+ or the build will break! -->
+ <!-- <module>../drools</module> -->
+
+ <!--module>../site</module-->
+</modules>
+<profiles>
+ <profile>
+ <id>emma-coverage</id>
+ <activation>
+ <property>
+ <name>coverage</name>
+ </property>
+ </activation>
+ <modules>
+ <module>reports/emma-coverage</module>
+ </modules>
+ </profile>
+</profiles>
+</project>
+
13 years, 10 months
- 1
- 0
JBoss Tools SVN: r23747 - in workspace/rstryker/rse/as/plugins: org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-07-27 10:13:22 -0400 (Tue, 27 Jul 2010)
New Revision: 23747
Added:
workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java
Removed:
workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/rse/core/IRSEConstants.java
Modified:
workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java
workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ModuleActionProvider.java
workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/rse/ui/RSEDeploymentPreferenceUI.java
Log:
JBIDE-6580 - publish now uses new values from the rse settings; still fails if user keeps setting on workspace metadata; UI on second page is not linked to first page...
Deleted: workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/rse/core/IRSEConstants.java
===================================================================
--- workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/rse/core/IRSEConstants.java 2010-07-27 13:45:14 UTC (rev 23746)
+++ workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/rse/core/IRSEConstants.java 2010-07-27 14:13:22 UTC (rev 23747)
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.ide.eclipse.as.rse.core;
-
-public interface IRSEConstants {
- public static final String RSE_SERVER_CONFIG = "org.jboss.ide.eclipse.as.rse.core.RSEServerConfig"; //$NON-NLS-1$
- public static final String RSE_SERVER_HOME_DIR = "org.jboss.ide.eclipse.as.rse.core.RSEServerHomeDir"; //$NON-NLS-1$
- public static final String RSE_SERVER_HOST = "org.jboss.ide.eclipse.as.rse.core.ServerHost"; //$NON-NLS-1$
- public static final String RSE_SERVER_DEFAULT_HOST = "Local"; //$NON-NLS-1$
-}
Modified: workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java
===================================================================
--- workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java 2010-07-27 13:45:14 UTC (rev 23746)
+++ workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java 2010-07-27 14:13:22 UTC (rev 23747)
@@ -28,8 +28,10 @@
import org.jboss.ide.eclipse.as.core.publishers.PublishUtil;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
+import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.server.xpl.PublishCopyUtil.IPublishCopyCallbackHandler;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
+import org.jboss.ide.eclipse.as.core.util.ServerConverter;
public class RSEPublishMethod extends AbstractPublishMethod {
@@ -77,10 +79,16 @@
protected void loadRemoteDeploymentDetails() throws CoreException{
// TODO obviously fix this
- this.remoteRootFolder = new Path("/home/rob/redhat/deploy"); //$NON-NLS-1$
+// String homeDir = RSEUtils.getRSEHomeDir(behaviour.getServer());
+// String conf = RSEUtils.getRSEConfigName(behaviour.getServer());
+ String connectionName = RSEUtils.getRSEConnectionName(behaviour.getServer());
+// this.remoteRootFolder = new Path("/home/rob/redhat/deploy"); //$NON-NLS-1$
+// this.remoteTemporaryFolder = new Path("/home/rob/redhat/tmp"); //$NON-NLS-1$
+ JBossServer jbs = ServerConverter.getJBossServer(behaviour.getServer());
+ this.remoteRootFolder = new Path(RSEUtils.getDeployRootFolder(jbs));
this.remoteTemporaryFolder = new Path("/home/rob/redhat/tmp"); //$NON-NLS-1$
- String CONNECTION_NAME = "Local"; //$NON-NLS-1$ //TODO obviously get this from somewhere else
- IHost host = findHost(CONNECTION_NAME);
+
+ IHost host = findHost(connectionName);
if( host != null ) {
fileSubSystem = findFileTransferSubSystem(host);
} else {
Copied: workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java (from rev 23742, workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/rse/core/IRSEConstants.java)
===================================================================
--- workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java (rev 0)
+++ workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java 2010-07-27 14:13:22 UTC (rev 23747)
@@ -0,0 +1,94 @@
+/*******************************************************************************
+ * Copyright (c) 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
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.ide.eclipse.as.rse.core;
+
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.wst.server.core.IServer;
+import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
+import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
+import org.jboss.ide.eclipse.as.core.util.IConstants;
+import org.jboss.ide.eclipse.as.core.util.ServerConverter;
+
+
+/*
+ * Some of this code will need to be abstracted out from JBossServer
+ * and turned into a proper API, but in as simple a way as possible
+ */
+public class RSEUtils {
+ public static final String RSE_SERVER_CONFIG = "org.jboss.ide.eclipse.as.rse.core.RSEServerConfig"; //$NON-NLS-1$
+ public static final String RSE_SERVER_HOME_DIR = "org.jboss.ide.eclipse.as.rse.core.RSEServerHomeDir"; //$NON-NLS-1$
+ public static final String RSE_SERVER_HOST = "org.jboss.ide.eclipse.as.rse.core.ServerHost"; //$NON-NLS-1$
+ public static final String RSE_SERVER_DEFAULT_HOST = "Local"; //$NON-NLS-1$
+
+ public static String getRSEConnectionName(IServer server) {
+ return server.getAttribute(RSEUtils.RSE_SERVER_HOST, RSE_SERVER_DEFAULT_HOST);
+ }
+
+ public static String getRSEHomeDir(IServer server) {
+ return server.getAttribute(RSEUtils.RSE_SERVER_HOME_DIR, server.getRuntime().getLocation().toString());
+ }
+
+ public static String getRSEConfigName(IServer server) {
+ IJBossServerRuntime runtime = ServerConverter.getJBossRuntime(server);
+ return server.getAttribute(RSEUtils.RSE_SERVER_CONFIG, runtime.getJBossConfiguration());
+ }
+
+ public static String getDeployRootFolder(JBossServer server) {
+ return getDeployRootFolder(server.getServer(), server.getDeployLocationType());
+ }
+
+ /* Copied from JBossServer.getDeployFolder(etc) */
+ public static String getDeployRootFolder(IServer server, String type) {
+ if( type.equals(JBossServer.DEPLOY_CUSTOM)) {
+ String val = server.getAttribute(JBossServer.DEPLOY_DIRECTORY, (String)null);
+ if( val != null ) {
+ IPath val2 = new Path(val);
+ return makeGlobal(server, val2).toString();
+ }
+ // if no value is set, default to metadata
+ type = JBossServer.DEPLOY_SERVER;
+ }
+ // TODO error here, or sensible default?
+ if( type.equals(JBossServer.DEPLOY_METADATA)) {
+ return JBossServerCorePlugin.getServerStateLocation(server).
+ append(IJBossServerConstants.DEPLOY).makeAbsolute().toString();
+ } else if( type.equals(JBossServer.DEPLOY_SERVER)) {
+ String loc = IConstants.SERVER;
+ String config = getRSEConfigName(server);
+ IPath p = new Path(loc).append(config)
+ .append(IJBossServerConstants.DEPLOY);
+ return makeGlobal(server, p).toString();
+ }
+ return null;
+ }
+
+ public static IPath makeRelative(IServer server, IPath p) {
+ if( p.isAbsolute()) {
+ if(new Path(getRSEHomeDir(server)).isPrefixOf(p)) {
+ int size = new Path(getRSEHomeDir(server)).toOSString().length();
+ return new Path(p.toOSString().substring(size)).makeRelative();
+ }
+ }
+ return p;
+ }
+
+ public static IPath makeGlobal(IServer server, IPath p) {
+ if( !p.isAbsolute()) {
+ return new Path(getRSEHomeDir(server)).append(p).makeAbsolute();
+ }
+ return p;
+ }
+
+
+}
Modified: workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ModuleActionProvider.java
===================================================================
--- workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ModuleActionProvider.java 2010-07-27 13:45:14 UTC (rev 23746)
+++ workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ModuleActionProvider.java 2010-07-27 14:13:22 UTC (rev 23747)
@@ -86,6 +86,7 @@
if (selection.size() == 1) {
ModuleServer moduleServer = (ModuleServer) selection.getFirstElement();
IServer server = moduleServer.getServer();
+ // TODO This needs to be changed; it's horrible to debug
if (ExploreUtils.canExplore(server)) {
if (getDeployPath() != null) {
menu.insertBefore(ServerActionProvider.CONTROL_MODULE_SECTION_END_SEPARATOR, exploreAction);
Modified: workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/rse/ui/RSEDeploymentPreferenceUI.java
===================================================================
--- workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/rse/ui/RSEDeploymentPreferenceUI.java 2010-07-27 13:45:14 UTC (rev 23746)
+++ workspace/rstryker/rse/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/rse/ui/RSEDeploymentPreferenceUI.java 2010-07-27 14:13:22 UTC (rev 23747)
@@ -24,7 +24,7 @@
import org.eclipse.swt.widgets.Text;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
-import org.jboss.ide.eclipse.as.rse.core.IRSEConstants;
+import org.jboss.ide.eclipse.as.rse.core.RSEUtils;
import org.jboss.ide.eclipse.as.ui.UIUtil;
import org.jboss.ide.eclipse.as.ui.editor.IDeploymentTypeUI;
import org.jboss.ide.eclipse.as.ui.editor.ServerModeSection;
@@ -53,7 +53,7 @@
Composite child = new Composite(this, SWT.None);
child.setLayoutData(UIUtil.createFormData2(0, 0, null, 0, 0, 5, 100, 0));
child.setLayout(new GridLayout());
- String current = modeSection.getServer().getAttribute(IRSEConstants.RSE_SERVER_HOST, IRSEConstants.RSE_SERVER_DEFAULT_HOST);
+ String current = modeSection.getServer().getAttribute(RSEUtils.RSE_SERVER_HOST, RSEUtils.RSE_SERVER_DEFAULT_HOST);
combo = new SystemHostCombo(child, SWT.NULL, findHost(current), false,
/* ISubSystemConfigurationCategories.SUBSYSTEM_CATEGORY_FILES*/
"files");
@@ -67,7 +67,7 @@
rseServerHome = new Text(this, SWT.SINGLE | SWT.BORDER);
serverHomeLabel.setLayoutData(UIUtil.createFormData2(child, 7, null, 0, 0, 10, null, 0));
rseServerHome.setLayoutData(UIUtil.createFormData2(child, 5, null, 0, serverHomeLabel, 5, 100, -5));
- rseServerHome.setText(modeSection.getServer().getAttribute(IRSEConstants.RSE_SERVER_HOME_DIR,
+ rseServerHome.setText(modeSection.getServer().getAttribute(RSEUtils.RSE_SERVER_HOME_DIR,
getRuntime().getRuntime().getLocation().toString()));
rseServerHome.addModifyListener(new ModifyListener(){
public void modifyText(ModifyEvent e) {
@@ -79,7 +79,7 @@
rseServerConfig= new Text(this, SWT.SINGLE | SWT.BORDER);
serverConfigLabel.setLayoutData(UIUtil.createFormData2(rseServerHome, 7, null, 0, 0, 10, null, 0));
rseServerConfig.setLayoutData(UIUtil.createFormData2(rseServerHome, 5, null, 0, serverConfigLabel, 5, 100, -5));
- rseServerConfig.setText(modeSection.getServer().getAttribute(IRSEConstants.RSE_SERVER_CONFIG,
+ rseServerConfig.setText(modeSection.getServer().getAttribute(RSEUtils.RSE_SERVER_CONFIG,
getRuntime().getJBossConfiguration()));
rseServerConfig.addModifyListener(new ModifyListener(){
public void modifyText(ModifyEvent e) {
@@ -93,19 +93,19 @@
protected void rseHostChanged() {
modeSection.getCommandManager().execute(new ChangeServerPropertyCommand(
- modeSection.getServer(), IRSEConstants.RSE_SERVER_HOST, combo.getHost().getAliasName(),
+ modeSection.getServer(), RSEUtils.RSE_SERVER_HOST, combo.getHost().getAliasName(),
"Change RSE Host"));
}
protected void serverHomeChanged() {
modeSection.getCommandManager().execute(new ChangeServerPropertyCommand(
- modeSection.getServer(), IRSEConstants.RSE_SERVER_HOME_DIR, rseServerHome.getText(),
+ modeSection.getServer(), RSEUtils.RSE_SERVER_HOME_DIR, rseServerHome.getText(),
"Change RSE Server's Home Directory"));
}
protected void serverConfigChanged() {
modeSection.getCommandManager().execute(new ChangeServerPropertyCommand(
- modeSection.getServer(), IRSEConstants.RSE_SERVER_CONFIG, rseServerConfig.getText(),
+ modeSection.getServer(), RSEUtils.RSE_SERVER_CONFIG, rseServerConfig.getText(),
"Change RSE Server's Configuration"));
}
13 years, 10 months
- 1
- 0
JBoss Tools SVN: r23746 - in trunk/cdi/tests: org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2010-07-27 09:45:14 -0400 (Tue, 27 Jul 2010)
New Revision: 23746
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/openon/CustomProducerImpl.java
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java
Log:
https://jira.jboss.org/browse/JBIDE-3124
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/openon/CustomProducerImpl.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/openon/CustomProducerImpl.java 2010-07-27 13:39:49 UTC (rev 23745)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/openon/CustomProducerImpl.java 2010-07-27 13:45:14 UTC (rev 23746)
@@ -29,7 +29,7 @@
}
@Produces
- public Foo produce2((a)New(Foo.class) Foo order)
+ public Foo produce2(Foo order)
{
return new Foo("foo!");
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java 2010-07-27 13:39:49 UTC (rev 23745)
+++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java 2010-07-27 13:45:14 UTC (rev 23746)
@@ -25,10 +25,7 @@
public void testInjectedProducerMethodParametersHyperlinkDetector() throws Exception {
ArrayList<Region> regionList = new ArrayList<Region>();
- regionList.add(new Region(552, 3)); // Foo
- regionList.add(new Region(556, 3)); // Foo
- regionList.add(new Region(567, 3)); // Foo
- regionList.add(new Region(571, 5)); // order
+ regionList.add(new Region(551, 9)); // order
checkRegions("JavaSource/org/jboss/jsr299/tck/tests/jbt/openon/CustomProducerImpl.java", regionList, new InjectedPointHyperlinkDetector());
}
13 years, 10 months
- 1
- 0
JBoss Tools SVN: r23745 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test: tck and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-07-27 09:39:49 -0400 (Tue, 27 Jul 2010)
New Revision: 23745
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ObserverMethodResolutionTest.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java
Log:
https://jira.jboss.org/browse/JBIDE-6701
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2010-07-27 10:26:57 UTC (rev 23744)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2010-07-27 13:39:49 UTC (rev 23745)
@@ -26,6 +26,7 @@
import org.jboss.tools.cdi.core.test.tck.InjectionPointTest;
import org.jboss.tools.cdi.core.test.tck.InterceptorDefinitionTest;
import org.jboss.tools.cdi.core.test.tck.NameDefinitionTest;
+import org.jboss.tools.cdi.core.test.tck.ObserverMethodResolutionTest;
import org.jboss.tools.cdi.core.test.tck.ProducerMethodDefinitionTest;
import org.jboss.tools.cdi.core.test.tck.QualifierDefinitionTest;
import org.jboss.tools.cdi.core.test.tck.QualifierWithMembersTest;
@@ -65,6 +66,7 @@
suite.addTestSuite(DynamicLookupTest.class);
suite.addTestSuite(InterceptorDefinitionTest.class);
suite.addTestSuite(ValidationTest.class);
+ suite.addTestSuite(ObserverMethodResolutionTest.class);
return new CDICoreTestSetup(suite);
}
}
\ No newline at end of file
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ObserverMethodResolutionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ObserverMethodResolutionTest.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ObserverMethodResolutionTest.java 2010-07-27 13:39:49 UTC (rev 23745)
@@ -0,0 +1,54 @@
+/*******************************************************************************
+ * Copyright (c) 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
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.core.test.tck;
+
+import java.util.Set;
+
+import org.eclipse.jdt.core.IMethod;
+import org.jboss.tools.cdi.core.IInjectionPoint;
+import org.jboss.tools.cdi.core.IInjectionPointField;
+import org.jboss.tools.cdi.core.IInjectionPointParameter;
+import org.jboss.tools.cdi.core.IObserverMethod;
+import org.jboss.tools.cdi.core.IParameter;
+
+/**
+ * @author Viacheslav Kabanovich
+ */
+public class ObserverMethodResolutionTest extends TCKTest {
+
+ public void testObserverMethodResolution() {
+ IInjectionPointField tamingEvent = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/event/fires/DogWhisperer.java", "tamingEvent");
+ assertNotNull(toString());
+
+ Set<IObserverMethod> observers = tamingEvent.getCDIProject().resolveObserverMethods(tamingEvent);
+ assertFalse(observers.isEmpty());
+
+ IObserverMethod tamedObserver = null;
+ for (IObserverMethod m: observers) {
+ IMethod jm = m.getMethod();
+ if("tamed".equals(jm.getElementName())) {
+ tamedObserver = m;
+ }
+ }
+ assertNotNull(tamedObserver);
+
+ Set<IParameter> p = tamedObserver.getObservedParameters();
+ assertTrue(p.size() == 1);
+
+ IParameter observerParameter = p.iterator().next();
+ assertTrue(observerParameter instanceof IInjectionPointParameter);
+
+ Set<IInjectionPoint> points = tamedObserver.getClassBean().getCDIProject().findObservedEvents((IInjectionPointParameter)observerParameter);
+ assertTrue(points.size() == 1);
+ assertTrue(points.contains(tamingEvent));
+ }
+
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ObserverMethodResolutionTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
13 years, 10 months
- 1
- 0
JBoss Tools SVN: r23744 - trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2010-07-27 06:26:57 -0400 (Tue, 27 Jul 2010)
New Revision: 23744
Added:
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/EventAndObserverMethodHyperlinkDetectorTest.java
Removed:
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/EventHyperlinkDetectorTest.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CdiTextExtAllTests.java
Log:
https://jira.jboss.org/browse/JBIDE-3124
Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CdiTextExtAllTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CdiTextExtAllTests.java 2010-07-27 08:43:54 UTC (rev 23743)
+++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CdiTextExtAllTests.java 2010-07-27 10:26:57 UTC (rev 23744)
@@ -15,7 +15,7 @@
TestSuite suite = new TestSuite(CdiTextExtAllTests.class.getName());
suite.addTest(new CDICoreTestSetup(new TestSuite(InjectedPointHyperlinkDetectorTest.class)));
suite.addTest(new CDICoreTestSetup(new TestSuite(ProducerDisposerHyperlinkDetectorTest.class)));
- suite.addTest(new CDICoreTestSetup(new TestSuite(EventHyperlinkDetectorTest.class)));
+ suite.addTest(new CDICoreTestSetup(new TestSuite(EventAndObserverMethodHyperlinkDetectorTest.class)));
return suite;
}
}
Copied: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/EventAndObserverMethodHyperlinkDetectorTest.java (from rev 23741, trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/EventHyperlinkDetectorTest.java)
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/EventAndObserverMethodHyperlinkDetectorTest.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/EventAndObserverMethodHyperlinkDetectorTest.java 2010-07-27 10:26:57 UTC (rev 23744)
@@ -0,0 +1,36 @@
+package org.jboss.tools.cdi.text.ext.test;
+
+import java.util.ArrayList;
+
+import org.eclipse.jface.text.Region;
+import org.jboss.tools.cdi.text.ext.hyperlink.EventAndObserverMethodHyperlinkDetector;
+
+public class EventAndObserverMethodHyperlinkDetectorTest extends HyperlinkDetectorTest {
+
+ public void testEventHyperlinkDetector() throws Exception {
+ ArrayList<Region> regionList = new ArrayList<Region>();
+ regionList.add(new Region(959, 6));
+ regionList.add(new Region(967, 16));
+ regionList.add(new Region(985, 11));
+ regionList.add(new Region(1006, 6));
+ regionList.add(new Region(1014, 3));
+ regionList.add(new Region(1019, 34));
+ regionList.add(new Region(1055, 42));
+ regionList.add(new Region(1107, 6));
+ regionList.add(new Region(1115, 34));
+ regionList.add(new Region(1151, 36));
+ regionList.add(new Region(1188, 3));
+ regionList.add(new Region(1235, 11));
+ regionList.add(new Region(1334, 42));
+
+ checkRegions("JavaSource/org/jboss/jsr299/tck/tests/event/bindingTypes/EventEmitter.java", regionList, new EventAndObserverMethodHyperlinkDetector());
+ }
+
+ public void testObserverMethodHyperlinkDetector() throws Exception {
+ ArrayList<Region> regionList = new ArrayList<Region>();
+ regionList.add(new Region(1216, 15));
+
+ checkRegions("JavaSource/org/jboss/jsr299/tck/tests/event/observer/checkedException/TeaCupPomeranian.java", regionList, new EventAndObserverMethodHyperlinkDetector());
+ }
+
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/EventAndObserverMethodHyperlinkDetectorTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/EventHyperlinkDetectorTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/EventHyperlinkDetectorTest.java 2010-07-27 08:43:54 UTC (rev 23743)
+++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/EventHyperlinkDetectorTest.java 2010-07-27 10:26:57 UTC (rev 23744)
@@ -1,29 +0,0 @@
-package org.jboss.tools.cdi.text.ext.test;
-
-import java.util.ArrayList;
-
-import org.eclipse.jface.text.Region;
-import org.jboss.tools.cdi.text.ext.hyperlink.EventAndObserverMethodHyperlinkDetector;
-
-public class EventHyperlinkDetectorTest extends HyperlinkDetectorTest {
-
- public void testEventHyperlinkDetector() throws Exception {
- ArrayList<Region> regionList = new ArrayList<Region>();
- regionList.add(new Region(959, 6));
- regionList.add(new Region(967, 16));
- regionList.add(new Region(985, 11));
- regionList.add(new Region(1006, 6));
- regionList.add(new Region(1014, 3));
- regionList.add(new Region(1019, 34));
- regionList.add(new Region(1055, 42));
- regionList.add(new Region(1107, 6));
- regionList.add(new Region(1115, 34));
- regionList.add(new Region(1151, 36));
- regionList.add(new Region(1188, 3));
- regionList.add(new Region(1235, 11));
- regionList.add(new Region(1334, 42));
-
- checkRegions("JavaSource/org/jboss/jsr299/tck/tests/event/bindingTypes/EventEmitter.java", regionList, new EventAndObserverMethodHyperlinkDetector());
- }
-
-}
\ No newline at end of file
13 years, 10 months
- 1
- 0