September 2010 - jbosstools-commits

JBoss Tools SVN: r24942 - in trunk/cdi/plugins/org.jboss.tools.cdi.xml: resources/meta and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2010-09-15 11:28:30 -0400 (Wed, 15 Sep 2010) New Revision: 24942 Removed: trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/WeldIncludeObjectImpl.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/plugin.xml trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/meta/cdi-weld.meta trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/CDIBeansLoaderUtil.java trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/handlers/AddIncludeSupport.java Log: JBIDE-6998 https://jira.jboss.org/browse/JBIDE-6998 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/plugin.xml =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.xml/plugin.xml 2010-09-15 15:27:26 UTC (rev 24941) +++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/plugin.xml 2010-09-15 15:28:30 UTC (rev 24942) @@ -20,8 +20,6 @@ class="org.jboss.tools.cdi.xml.beans.model.CDIBeansFileLoader"/> <xclass id="org.jboss.tools.cdi.xml.beans.model.CDIBeansEntityRecognizer" class="org.jboss.tools.cdi.xml.beans.model.CDIBeansEntityRecognizer"/> - <xclass id="org.jboss.tools.cdi.xml.beans.model.WeldIncludeObjectImpl" - class="org.jboss.tools.cdi.xml.beans.model.WeldIncludeObjectImpl"/> <xclass id="org.jboss.tools.cdi.xml.beans.model.handlers.AddIncludeSupport" class="org.jboss.tools.cdi.xml.beans.model.handlers.AddIncludeSupport"/> Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/meta/cdi-weld.meta =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/meta/cdi-weld.meta 2010-09-15 15:27:26 UTC (rev 24941) +++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/meta/cdi-weld.meta 2010-09-15 15:28:30 UTC (rev 24942) @@ -70,7 +70,7 @@ ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> - <XActionItem BaseActionName="Copy" HandlerClassName="%Paste%" + <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%" ICON="action.paste" displayName="Paste" kind="action" name="Paste"/> </XActionItem> <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> @@ -88,8 +88,7 @@ </XActionItem> <XDependencies/> </XModelEntity> - <XModelEntity - ImplementingClass="org.jboss.tools.cdi.xml.beans.model.WeldIncludeObjectImpl" + <XModelEntity ImplementingClass="%Custom%" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.cdi.xml.ui.editor.form.CDIXMLFormLayoutData;children=%Ordered%" XMLSUBPATH="weld:exclude" name="CDIWeldExclude"> <XChildrenEntities> @@ -105,9 +104,14 @@ <XModelAttribute default="exclude" loader="ElementType" name="element type"> <Editor name="Uneditable"/> </XModelAttribute> - <XModelAttribute name="name/pattern" visibility="false"/> - <XModelAttribute PROPERTIES="id=true;category=general" name="name" xmlname="name"/> - <XModelAttribute PROPERTIES="id=true;category=general" name="pattern" xmlname="pattern"/> + <XModelAttribute PROPERTIES="id=true;category=general" name="name" xmlname="name|pattern"/> + <XModelAttribute PROPERTIES="category=general" default="false" name="is regular expression"> + <Constraint loader="List"> + <value name="false"/> + <value name="true"/> + </Constraint> + <Editor name="CheckBox"/> + </XModelAttribute> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> <Editor name="Note"/> </XModelAttribute> @@ -135,7 +139,7 @@ ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> - <XActionItem BaseActionName="Copy" HandlerClassName="%Paste%" + <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%" ICON="action.paste" displayName="Paste" kind="action" name="Paste"/> </XActionItem> <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> @@ -153,8 +157,7 @@ </XActionItem> <XDependencies/> </XModelEntity> - <XModelEntity - ImplementingClass="org.jboss.tools.cdi.xml.beans.model.WeldIncludeObjectImpl" + <XModelEntity ImplementingClass="%Custom%" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.cdi.xml.ui.editor.form.CDIXMLFormLayoutData;children=%Ordered%" XMLSUBPATH="weld:include" name="CDIWeldInclude"> <XChildrenEntities> @@ -170,9 +173,14 @@ <XModelAttribute default="include" loader="ElementType" name="element type"> <Editor name="Uneditable"/> </XModelAttribute> - <XModelAttribute name="name/pattern" visibility="false"/> - <XModelAttribute PROPERTIES="id=true;category=general" name="name" xmlname="name"/> - <XModelAttribute PROPERTIES="id=true;category=general" name="pattern" xmlname="pattern"/> + <XModelAttribute PROPERTIES="id=true;category=general" name="name" xmlname="name|pattern"/> + <XModelAttribute PROPERTIES="category=general" default="false" name="is regular expression"> + <Constraint loader="List"> + <value name="false"/> + <value name="true"/> + </Constraint> + <Editor name="CheckBox"/> + </XModelAttribute> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> <Editor name="Note"/> </XModelAttribute> @@ -200,7 +208,7 @@ ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> - <XActionItem BaseActionName="Copy" HandlerClassName="%Paste%" + <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%" ICON="action.paste" displayName="Paste" kind="action" name="Paste"/> </XActionItem> <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> @@ -234,58 +242,16 @@ </Constraint> <Editor name="RadioArray"/> </XModelAttribute> - <XModelAttribute name="name/pattern"/> - <XModelAttribute PROPERTIES="id=true;category=general" - default="false" name="is regular expression"> + <XModelAttribute name="name"/> + <XModelAttribute PROPERTIES="category=general" default="false" name="is regular expression"> <Constraint loader="List"> <value name="false"/> <value name="true"/> </Constraint> <Editor name="CheckBox"/> </XModelAttribute> - <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> - <Editor name="Note"/> - </XModelAttribute> </XModelAttributes> - <XActionItem kind="list"> - <XActionItem kind="list" name="CreateActions"> - <XActionItem HandlerClassName="%Create%" ICON="action.empty" - PROPERTIES="validator.add=true" WizardClassName="%Default%" - displayName="Add Class Available" kind="action" name="AddClass"> - <EntityData EntityName="CDIWeldClass"> - <AttributeData AttributeName="name"/> - </EntityData> - </XActionItem> - <XActionItem HandlerClassName="%Create%" ICON="action.empty" - PROPERTIES="validator.add=true" WizardClassName="%Default%" - displayName="Add System Property" kind="action" name="AddProperty"> - <EntityData EntityName="CDIWeldProperty"> - <AttributeData AttributeName="name"/> - <AttributeData AttributeName="value" Mandatory="no"/> - </EntityData> - </XActionItem> - </XActionItem> - <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> - <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" - ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> - <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" - ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> - <XActionItem BaseActionName="Copy" HandlerClassName="%Paste%" - ICON="action.paste" displayName="Paste" kind="action" name="Paste"/> - </XActionItem> - <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> - <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%" - ICON="action.delete" displayName="Delete" kind="action" name="Delete"/> - </XActionItem> - <XActionItem ICON="action.empty" kind="list" name="Properties"> - <XActionItem HandlerClassName="%Properties%" ICON="action.empty" - displayName="Properties..." kind="action" name="Properties"/> - </XActionItem> - <XActionItem displayName="move" kind="list" name="MoveActions"> - <XActionItem HIDE="always" HandlerClassName="%Move%" - ICON="action.move" displayName="Move" kind="action" name="Move"/> - </XActionItem> - </XActionItem> + <XActionItem kind="list"/> <XDependencies/> </XModelEntity> <XModelEntity ImplementingClass="%Custom%" @@ -331,7 +297,7 @@ ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> - <XActionItem BaseActionName="Copy" HandlerClassName="%Paste%" + <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%" ICON="action.paste" displayName="Paste" kind="action" name="Paste"/> </XActionItem> <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> @@ -380,7 +346,7 @@ displayName="Add Include/Exclude" kind="action" name="AddItem"> <EntityData EntityName="CDIWeldIncludeWizard"> <AttributeData AttributeName="kind" Mandatory="no"/> - <AttributeData AttributeName="name/pattern"/> + <AttributeData AttributeName="name"/> <AttributeData AttributeName="is regular expression" Mandatory="no"/> </EntityData> </XActionItem> @@ -393,6 +359,8 @@ ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> + <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%" + ICON="action.paste" displayName="Paste" kind="action" name="Paste"/> </XActionItem> <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%" Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/CDIBeansLoaderUtil.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/CDIBeansLoaderUtil.java 2010-09-15 15:27:26 UTC (rev 24941) +++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/CDIBeansLoaderUtil.java 2010-09-15 15:28:30 UTC (rev 24942) @@ -57,4 +57,40 @@ return false; } + public void loadAttributes(Element element, XModelObject o) { + super.loadAttributes(element, o); + String entity = o.getModelEntity().getName(); + if("CDIWeldInclude".equals(entity) || "CDIWeldExclude".equals(entity)) { + String namePattern = ""; + String name = element.getAttribute("name"); + if(name != null && name.length() > 0) { + namePattern = name; + o.setAttributeValue("is regular expression", "false"); + } + String pattern = element.getAttribute("pattern"); + if(pattern != null && pattern.length() > 0) { + namePattern = pattern; + o.setAttributeValue("is regular expression", "true"); + } + o.setAttributeValue("name", namePattern); + } + } + + public void saveAttribute(Element element, String xmlname, String value) { + int i = xmlname.indexOf('|'); + if(i >= 0) return; + super.saveAttribute(element, xmlname, value); + } + + public void saveAttributes(Element element, XModelObject o) { + super.saveAttributes(element, o); + String entity = o.getModelEntity().getName(); + if("CDIWeldInclude".equals(entity) || "CDIWeldExclude".equals(entity)) { + boolean isRegEx = "true".equals(o.getAttributeValue("is regular expression")); + String attr = isRegEx ? "pattern" : "name"; + String name = o.getAttributeValue("name"); + element.setAttribute(attr, name); + } + } + } Deleted: trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/WeldIncludeObjectImpl.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/WeldIncludeObjectImpl.java 2010-09-15 15:27:26 UTC (rev 24941) +++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/WeldIncludeObjectImpl.java 2010-09-15 15:28:30 UTC (rev 24942) @@ -1,22 +0,0 @@ -package org.jboss.tools.cdi.xml.beans.model; - -import org.jboss.tools.common.model.impl.CustomizedObjectImpl; - -public class WeldIncludeObjectImpl extends CustomizedObjectImpl { - private static final long serialVersionUID = 1L; - - public String name() { - String name = getAttributeValue("name"); - if(name == null || name.length() == 0) { - name = getAttributeValue("pattern"); - } - return name; - } - - public String getAttributeValue(String name) { - if("name/pattern".equals(name)) { - return name(); - } - return super.getAttributeValue(name); - } -} Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/handlers/AddIncludeSupport.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/handlers/AddIncludeSupport.java 2010-09-15 15:27:26 UTC (rev 24941) +++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/handlers/AddIncludeSupport.java 2010-09-15 15:28:30 UTC (rev 24942) @@ -31,13 +31,8 @@ boolean include = "include".equals(p0.getProperty("kind")); String entity = getObjectEntity(include); - XModelObject object = XModelObjectLoaderUtil.createValidObject(getTarget().getModel(), entity, null); + XModelObject object = XModelObjectLoaderUtil.createValidObject(getTarget().getModel(), entity, p0); - boolean isRegEx = "true".equals(p0.getProperty("is regular expression")); - String nameValue = p0.getProperty("name/pattern"); - String nameAttr = isRegEx ? "pattern" : "name"; - object.setAttributeValue(nameAttr, nameValue); - DefaultCreateHandler.addCreatedObject(getTarget(), object, FindObjectHelper.EVERY_WHERE); } @@ -53,21 +48,21 @@ return null; } - protected DefaultWizardDataValidator validator = new Validator(); - - public WizardDataValidator getValidator(int step) { - validator.setSupport(this, step); - return validator; - } - - class Validator extends DefaultWizardDataValidator { - public void validate(Properties data) { - boolean isRegEx = "true".equals(data.getProperty("is regular expression")); - String nameValue = data.getProperty("name/pattern"); - String nameAttr = isRegEx ? "pattern" : "name"; - data.setProperty(nameAttr, nameValue); - super.validate(data); - } - - } +// protected DefaultWizardDataValidator validator = new Validator(); +// +// public WizardDataValidator getValidator(int step) { +// validator.setSupport(this, step); +// return validator; +// } +// +// class Validator extends DefaultWizardDataValidator { +// public void validate(Properties data) { +// boolean isRegEx = "true".equals(data.getProperty("is regular expression")); +// String nameValue = data.getProperty("name/pattern"); +// String nameAttr = isRegEx ? "pattern" : "name"; +// data.setProperty(nameAttr, nameValue); +// super.validate(data); +// } +// +// } }

15 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r24941 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2010-09-15 11:27:26 -0400 (Wed, 15 Sep 2010) New Revision: 24941 Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/BeansXMLTest.java Log: JBIDE-6998 https://jira.jboss.org/browse/JBIDE-6998 Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/BeansXMLTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/BeansXMLTest.java 2010-09-15 14:55:47 UTC (rev 24940) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/BeansXMLTest.java 2010-09-15 15:27:26 UTC (rev 24941) @@ -62,26 +62,30 @@ XModelObject include1 = scan.getChildByPath("cls1"); assertNotNull(include1); assertEquals("CDIWeldInclude", include1.getModelEntity().getName()); - String pattern1 = include1.getAttributeValue("pattern"); + String pattern1 = include1.getAttributeValue("name"); assertEquals("cls1", pattern1); + assertEquals("true", include1.getAttributeValue("is regular expression")); XModelObject include2 = scan.getChildByPath("cls2"); assertNotNull(include2); assertEquals("CDIWeldInclude", include2.getModelEntity().getName()); String name2 = include2.getAttributeValue("name"); assertEquals("cls2", name2); + assertEquals("false", include2.getAttributeValue("is regular expression")); XModelObject exclude3 = scan.getChildByPath("cls3"); assertNotNull(exclude3); assertEquals("CDIWeldExclude", exclude3.getModelEntity().getName()); String name3 = exclude3.getAttributeValue("name"); assertEquals("cls3", name3); + assertEquals("false", exclude3.getAttributeValue("is regular expression")); XModelObject exclude4 = scan.getChildByPath("cls4"); assertNotNull(exclude4); assertEquals("CDIWeldExclude", exclude4.getModelEntity().getName()); - String pattern4 = exclude4.getAttributeValue("pattern"); + String pattern4 = exclude4.getAttributeValue("name"); assertEquals("cls4", pattern4); + assertEquals("true", exclude4.getAttributeValue("is regular expression")); }

15 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r24940 - trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2010-09-15 10:55:47 -0400 (Wed, 15 Sep 2010) New Revision: 24940 Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java Log: [JBIDE-6953] reversed checking order: first local enablement, then remote enablement Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java 2010-09-15 14:47:58 UTC (rev 24939) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java 2010-09-15 14:55:47 UTC (rev 24940) @@ -106,8 +106,8 @@ return Status.CANCEL_STATUS; } monitor.beginTask(ReportingMessages.UsageReport_Querying_Enablement, 2); - if (globalSettings.isAllInstancesReportingEnabled() - && globalSettings.isInstanceReportingEnabled()) { + if (globalSettings.isInstanceReportingEnabled() + && globalSettings.isAllInstancesReportingEnabled()) { if (monitor.isCanceled()) { return Status.CANCEL_STATUS; }

15 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r24939 - in trunk/usage: plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences and 4 other directories.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2010-09-15 10:47:58 -0400 (Wed, 15 Sep 2010) New Revision: 24939 Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpRemotePropertiesProvider.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/GlobalUsageSettings.java trunk/usage/tests/org.jboss.tools.usage.test/GlobalUsageSettingsTest.launch trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageSettingsTest.java Removed: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpResourceMap.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/GlobalUsageReportingSettings.java trunk/usage/tests/org.jboss.tools.usage.test/GlobalUsageReportingSettingsTest.launch trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageReportingSettingsTest.java Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java trunk/usage/tests/org.jboss.tools.usage.test/.settings/org.eclipse.jdt.core.prefs trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageTestSuite.java Log: [JBIDE-6953] implemented and unit-tested. testing real-live imminent Copied: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpRemotePropertiesProvider.java (from rev 24921, trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpResourceMap.java) =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpRemotePropertiesProvider.java (rev 0) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpRemotePropertiesProvider.java 2010-09-15 14:47:58 UTC (rev 24939) @@ -0,0 +1,169 @@ +/******************************************************************************* + * 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.usage.http; + +import java.io.BufferedInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.UnsupportedEncodingException; +import java.net.HttpURLConnection; +import java.net.URL; +import java.util.HashMap; +import java.util.Map; + +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Plugin; +import org.jboss.tools.usage.util.HttpEncodingUtils; +import org.jboss.tools.usage.util.LoggingUtils; +import org.jboss.tools.usage.util.StatusUtils; +import org.jboss.tools.usage.util.reader.ReaderUtils; + +/** + * Base class that holds a map that subclasses may get. The values in the map + * are fetched and parsed from a document that is fetched on a url that the + * subclass provides + * + * @author Andre Dietisheim + */ +public class HttpRemotePropertiesProvider { + + static final String GET_METHOD_NAME = "GET"; //$NON-NLS-1$ + + protected Plugin plugin; + private Map<String, String> valuesMap; + + private String[] keys; + + private String url; + + private char valueDelimiter; + + public HttpRemotePropertiesProvider(String url, char valueDelimiter, Plugin plugin, String... keys) { + this.url = url; + this.keys = keys; + this.valueDelimiter = valueDelimiter; + this.plugin = plugin; + } + + public Map<String, String> getValueMap() throws IOException { + if (valuesMap == null) { + HttpURLConnection urlConnection = createURLConnection(url); + InputStreamReader reader = request(urlConnection); + this.valuesMap = parse(keys, valueDelimiter, reader, new HashMap<String, String>()); + } + return valuesMap; + } + + /** + * Sends a http GET request to the given URL. Returns the response string or + * <tt>null</tt> if an error occurred. The errors catched are Exceptions or + * HTTP error codes. + * + * @param url + * the url to send the GET request to + * @return the response or <tt>null</tt> if an error occured. + * @throws UnsupportedEncodingException + * + * @see HttpURLConnection + */ + protected InputStreamReader request(HttpURLConnection urlConnection) throws IOException { + InputStreamReader responseReader = null; + try { + urlConnection.connect(); + int responseCode = getResponseCode(urlConnection); + if (responseCode == HttpURLConnection.HTTP_OK) { + IStatus status = StatusUtils.getInfoStatus( + plugin.getBundle().getSymbolicName() + , HttpMessages.HttpResourceMap_Info_HttpQuery + , url); + LoggingUtils.log(status, plugin); + responseReader = getInputStreamReader(urlConnection.getInputStream(), urlConnection.getContentType()); + } else { + IStatus status = StatusUtils.getErrorStatus( + plugin.getBundle().getSymbolicName() + , HttpMessages.HttpGetMethod_Error_Http, null, url); + plugin.getLog().log(status); + } + return responseReader; + } catch (IOException e) { + IStatus status = StatusUtils.getErrorStatus( + plugin.getBundle().getSymbolicName() + , HttpMessages.HttpGetMethod_Error_Http, e, url); + plugin.getLog().log(status); + throw e; + } + } + + private InputStreamReader getInputStreamReader(InputStream inputStream, String contentType) + throws UnsupportedEncodingException, IOException { + String contentTypeCharset = HttpEncodingUtils.getContentTypeCharset(contentType); + if (contentTypeCharset != null && contentTypeCharset.length() > 0) { + return new InputStreamReader(new BufferedInputStream(inputStream), + contentTypeCharset); + } else { + return new InputStreamReader(new BufferedInputStream(inputStream)); + } + } + + /** + * Parses the given string and extracts the enablement value. + * + * @param valueDelimiter + * + * @param input + * stream that holds + * @return + * @return true, if successful + */ + private Map<String, String> parse(String[] keys, char valueDelimiter, InputStreamReader reader, + Map<String, String> valuesMap) throws IOException { + for (String key = null; (key = ReaderUtils.skipUntil(reader, keys)) != null;) { + String value = ReaderUtils.readStringUntil(reader, valueDelimiter); + valuesMap.put(key, value); + } + return valuesMap; + } + + /** + * Creates a new url connection. + * + * @param urlString + * the url string + * @return the http url connection + * @throws IOException + * @throws IOException + * Signals that an I/O exception has occurred. + */ + protected HttpURLConnection createURLConnection(String urlString) throws IOException { + URL url = new URL(urlString); + HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection(); + urlConnection.setInstanceFollowRedirects(true); + urlConnection.setRequestMethod(GET_METHOD_NAME); + return urlConnection; + } + + /** + * Returns the return code from the given {@link HttpURLConnection}. + * Provided to be called by test cases so that they can retrieve the return + * code. + * + * @param urlConnection + * to get the response code from + * @return the return code the HttpUrlConnection received + * @throws IOException + * Signals that an I/O exception has occurred. + */ + protected int getResponseCode(HttpURLConnection urlConnection) throws IOException { + return urlConnection.getResponseCode(); + } + +} \ No newline at end of file Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpRemotePropertiesProvider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpResourceMap.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpResourceMap.java 2010-09-15 14:40:13 UTC (rev 24938) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpResourceMap.java 2010-09-15 14:47:58 UTC (rev 24939) @@ -1,169 +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.tools.usage.http; - -import java.io.BufferedInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.UnsupportedEncodingException; -import java.net.HttpURLConnection; -import java.net.URL; -import java.util.HashMap; -import java.util.Map; - -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Plugin; -import org.jboss.tools.usage.util.HttpEncodingUtils; -import org.jboss.tools.usage.util.LoggingUtils; -import org.jboss.tools.usage.util.StatusUtils; -import org.jboss.tools.usage.util.reader.ReaderUtils; - -/** - * Base class that holds a map that subclasses may get. The values in the map - * are fetched and parsed from a document that is fetched on a url that the - * subclass provides - * - * @author Andre Dietisheim - */ -public abstract class HttpResourceMap { - - static final String GET_METHOD_NAME = "GET"; //$NON-NLS-1$ - - protected Plugin plugin; - private Map<String, String> valuesMap; - - private String[] keys; - - private String url; - - private char valueDelimiter; - - public HttpResourceMap(String url, char valueDelimiter, Plugin plugin, String... keys) { - this.url = url; - this.keys = keys; - this.valueDelimiter = valueDelimiter; - this.plugin = plugin; - } - - protected Map<String, String> getValueMap() throws IOException { - if (valuesMap == null) { - HttpURLConnection urlConnection = createURLConnection(url); - InputStreamReader reader = request(urlConnection); - this.valuesMap = parse(keys, valueDelimiter, reader, new HashMap<String, String>()); - } - return valuesMap; - } - - /** - * Sends a http GET request to the given URL. Returns the response string or - * <tt>null</tt> if an error occurred. The errors catched are Exceptions or - * HTTP error codes. - * - * @param url - * the url to send the GET request to - * @return the response or <tt>null</tt> if an error occured. - * @throws UnsupportedEncodingException - * - * @see HttpURLConnection - */ - protected InputStreamReader request(HttpURLConnection urlConnection) throws IOException { - InputStreamReader responseReader = null; - try { - urlConnection.connect(); - int responseCode = getResponseCode(urlConnection); - if (responseCode == HttpURLConnection.HTTP_OK) { - IStatus status = StatusUtils.getInfoStatus( - plugin.getBundle().getSymbolicName() - , HttpMessages.HttpResourceMap_Info_HttpQuery - , url); - LoggingUtils.log(status, plugin); - responseReader = getInputStreamReader(urlConnection.getInputStream(), urlConnection.getContentType()); - } else { - IStatus status = StatusUtils.getErrorStatus( - plugin.getBundle().getSymbolicName() - , HttpMessages.HttpGetMethod_Error_Http, null, url); - plugin.getLog().log(status); - } - return responseReader; - } catch (IOException e) { - IStatus status = StatusUtils.getErrorStatus( - plugin.getBundle().getSymbolicName() - , HttpMessages.HttpGetMethod_Error_Http, e, url); - plugin.getLog().log(status); - throw e; - } - } - - private InputStreamReader getInputStreamReader(InputStream inputStream, String contentType) - throws UnsupportedEncodingException, IOException { - String contentTypeCharset = HttpEncodingUtils.getContentTypeCharset(contentType); - if (contentTypeCharset != null && contentTypeCharset.length() > 0) { - return new InputStreamReader(new BufferedInputStream(inputStream), - contentTypeCharset); - } else { - return new InputStreamReader(new BufferedInputStream(inputStream)); - } - } - - /** - * Parses the given string and extracts the enablement value. - * - * @param valueDelimiter - * - * @param input - * stream that holds - * @return - * @return true, if successful - */ - private Map<String, String> parse(String[] keys, char valueDelimiter, InputStreamReader reader, - Map<String, String> valuesMap) throws IOException { - for (String key = null; (key = ReaderUtils.skipUntil(reader, keys)) != null;) { - String value = ReaderUtils.readStringUntil(reader, valueDelimiter); - valuesMap.put(key, value); - } - return valuesMap; - } - - /** - * Creates a new url connection. - * - * @param urlString - * the url string - * @return the http url connection - * @throws IOException - * @throws IOException - * Signals that an I/O exception has occurred. - */ - protected HttpURLConnection createURLConnection(String urlString) throws IOException { - URL url = new URL(urlString); - HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection(); - urlConnection.setInstanceFollowRedirects(true); - urlConnection.setRequestMethod(GET_METHOD_NAME); - return urlConnection; - } - - /** - * Returns the return code from the given {@link HttpURLConnection}. - * Provided to be called by test cases so that they can retrieve the return - * code. - * - * @param urlConnection - * to get the response code from - * @return the return code the HttpUrlConnection received - * @throws IOException - * Signals that an I/O exception has occurred. - */ - protected int getResponseCode(HttpURLConnection urlConnection) throws IOException { - return urlConnection.getResponseCode(); - } - -} \ No newline at end of file Deleted: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/GlobalUsageReportingSettings.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/GlobalUsageReportingSettings.java 2010-09-15 14:40:13 UTC (rev 24938) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/GlobalUsageReportingSettings.java 2010-09-15 14:47:58 UTC (rev 24939) @@ -1,53 +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.tools.usage.preferences; - -import java.util.Map; - -import org.eclipse.core.runtime.Plugin; -import org.jboss.tools.usage.http.HttpResourceMap; - -/** - * A class that implements a global reporting enablement setting. The current - * implementation queries a given url and extracts the enablement value out of - * the response. - * - * @author Andre Dietisheim - */ -public class GlobalUsageReportingSettings extends HttpResourceMap { - - private static final String REPORTING_ENABLEMENT_URL = "http://anonsvn.jboss.org/repos/jbosstools/workspace/usage/usage.properties"; //$NON-NLS-1$ - - public static final String REPORT_ENABLEMENT_KEY = "usage_reporting_enabled="; //$NON-NLS-1$ - private static final boolean REPORT_ENABLEMENT_DEFAULT = false; - - /* the delimiter that delimits the value */ - private static final char VALUE_DELIMITER = '\n'; - - public GlobalUsageReportingSettings(Plugin plugin) { - super(REPORTING_ENABLEMENT_URL - , VALUE_DELIMITER - , plugin - , REPORT_ENABLEMENT_KEY); - - this.plugin = plugin; - } - - public boolean isEnabled() { - try { - Map<String, String> valueMap = getValueMap(); - String isEnabled = valueMap.get(REPORT_ENABLEMENT_KEY); - return Boolean.valueOf(isEnabled); - } catch (Exception e) { - return REPORT_ENABLEMENT_DEFAULT; - } - } -} Copied: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/GlobalUsageSettings.java (from rev 24916, trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/GlobalUsageReportingSettings.java) =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/GlobalUsageSettings.java (rev 0) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/GlobalUsageSettings.java 2010-09-15 14:47:58 UTC (rev 24939) @@ -0,0 +1,86 @@ +/******************************************************************************* + * 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.usage.preferences; + +import java.util.Map; + +import org.eclipse.core.runtime.Plugin; +import org.jboss.tools.usage.http.HttpRemotePropertiesProvider; + +/** + * A class that implements a global reporting enablement setting. The current + * implementation queries a given url and extracts the enablement value out of + * the response. + * + * @author Andre Dietisheim + */ +public class GlobalUsageSettings { + + private static final String REMOTEPROPS_URL = "http://anonsvn.jboss.org/repos/jbosstools/workspace/usage/usage.properties"; //$NON-NLS-1$ + + public static final String REMOTEPROPS_ALLINSTANCES_ENABLED_KEY = "usage_allinstances_enabled="; //$NON-NLS-1$ + + private static final boolean REMOTEPROPS_ALLINSTANCES_ENABLED_DEFAULT = false; + + /** the delimiter that delimits the key/value-pairs */ + private static final char VALUE_DELIMITER = '\n'; + + /** + * system property that enables/disables reporting for current eclipse + * instance + */ + public static final String SYSPROPS_INSTANCE_ENABLED_KEY = "usage_instance_enabled"; //$NON-NLS-1$ + + private static final boolean SYSPROPS_INSTANCE_ENABLED_KEY_DEFAULT = true; + + private HttpRemotePropertiesProvider remoteMap; + + public GlobalUsageSettings(Plugin plugin) { + remoteMap = createRemoteMap( + REMOTEPROPS_URL + , VALUE_DELIMITER + , plugin + , REMOTEPROPS_ALLINSTANCES_ENABLED_KEY); + } + + /** + * Returns <code>true</code> if reporting is enabled for all instances + * + * @return <code>true, if the remote peer is set to enabled + * + * @see #REMOTEPROPS_URL + * @see #REMOTEPROPS_ALLINSTANCES_ENABLED_KEY + */ + public boolean isAllInstancesReportingEnabled() { + try { + Map<String, String> valueMap = remoteMap.getValueMap(); + String isEnabled = valueMap.get(REMOTEPROPS_ALLINSTANCES_ENABLED_KEY); + return Boolean.valueOf(isEnabled); + } catch (Exception e) { + return REMOTEPROPS_ALLINSTANCES_ENABLED_DEFAULT; + } + } + + public boolean isInstanceReportingEnabled() { + return Boolean.valueOf( + System.getProperty(SYSPROPS_INSTANCE_ENABLED_KEY, + String.valueOf(SYSPROPS_INSTANCE_ENABLED_KEY_DEFAULT))); + } + + protected HttpRemotePropertiesProvider createRemoteMap(String url, char valueDelimiter, Plugin plugin, + String... keys) { + return new HttpRemotePropertiesProvider( + url, + valueDelimiter, + plugin, + keys); + } +} Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/GlobalUsageSettings.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java 2010-09-15 14:40:13 UTC (rev 24938) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java 2010-09-15 14:47:58 UTC (rev 24939) @@ -31,7 +31,7 @@ import org.jboss.tools.usage.http.HttpGetRequest; import org.jboss.tools.usage.http.IHttpGetRequest; import org.jboss.tools.usage.internal.JBossToolsUsageActivator; -import org.jboss.tools.usage.preferences.GlobalUsageReportingSettings; +import org.jboss.tools.usage.preferences.GlobalUsageSettings; import org.jboss.tools.usage.util.PreferencesUtils; import org.jboss.tools.usage.util.StatusUtils; import org.osgi.service.prefs.BackingStoreException; @@ -50,7 +50,7 @@ .setChild(new FocusPoint("action") //$NON-NLS-1$ .setChild(new FocusPoint("wsstartup")))); //$NON-NLS-1$ - private GlobalUsageReportingSettings globalSettings = new GlobalUsageReportingSettings(JBossToolsUsageActivator + private GlobalUsageSettings globalSettings = new GlobalUsageSettings(JBossToolsUsageActivator .getDefault()); public void report() { @@ -106,7 +106,8 @@ return Status.CANCEL_STATUS; } monitor.beginTask(ReportingMessages.UsageReport_Querying_Enablement, 2); - if (globalSettings.isEnabled()) { + if (globalSettings.isAllInstancesReportingEnabled() + && globalSettings.isInstanceReportingEnabled()) { if (monitor.isCanceled()) { return Status.CANCEL_STATUS; } Modified: trunk/usage/tests/org.jboss.tools.usage.test/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/.settings/org.eclipse.jdt.core.prefs 2010-09-15 14:40:13 UTC (rev 24938) +++ trunk/usage/tests/org.jboss.tools.usage.test/.settings/org.eclipse.jdt.core.prefs 2010-09-15 14:47:58 UTC (rev 24939) @@ -1,7 +1,8 @@ -#Wed Aug 18 12:56:58 CEST 2010 +#Wed Sep 15 16:01:41 CEST 2010 eclipse.preferences.version=1 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 @@ -12,6 +13,7 @@ org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 @@ -56,10 +58,15 @@ org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert org.eclipse.jdt.core.formatter.comment.line_length=80 +org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true +org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true org.eclipse.jdt.core.formatter.compact_else_if=true org.eclipse.jdt.core.formatter.continuation_indentation=2 org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off +org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true @@ -74,6 +81,7 @@ org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert @@ -256,5 +264,7 @@ org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true org.eclipse.jdt.core.formatter.tabulation.char=tab org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_on_off_tags=false org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true Deleted: trunk/usage/tests/org.jboss.tools.usage.test/GlobalUsageReportingSettingsTest.launch =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/GlobalUsageReportingSettingsTest.launch 2010-09-15 14:40:13 UTC (rev 24938) +++ trunk/usage/tests/org.jboss.tools.usage.test/GlobalUsageReportingSettingsTest.launch 2010-09-15 14:47:58 UTC (rev 24939) @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig"> -<booleanAttribute key="append.args" value="true"/> -<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/> -<booleanAttribute key="askclear" value="false"/> -<booleanAttribute key="automaticAdd" value="true"/> -<booleanAttribute key="automaticValidate" value="false"/> -<stringAttribute key="bootstrap" value=""/> -<stringAttribute key="checked" value="[NONE]"/> -<booleanAttribute key="clearConfig" value="false"/> -<booleanAttribute key="clearws" value="true"/> -<booleanAttribute key="clearwslog" value="false"/> -<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/> -<booleanAttribute key="default" value="false"/> -<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.common.text.xml,org.jboss.tools.common.meta.ui,org.jboss.tools.ui.bot.ext,org.jboss.tools.common,org.jboss.tools.common.verification.ui.test,org.jboss.tools.common.projecttemplates,org.jboss.tools.common.el.core,org.jboss.tools.common.verification.ui,org.jboss.tools.common.gef,org.jboss.tools.common.test,org.jboss.tools.common.verification.test,org.jboss.tools.common.verification,org.jboss.tools.common.model,org.jboss.tools.gwt.ui,org.jboss.tools.common.model.ui.capabilities,org.jboss.tools.common.resref.core,org.jboss.tools.common.ui,org.jboss.tools.common.el.ui,org.jboss.tools.common.text.ext,org.jboss.tools.gwt.core,org.jboss.tools.common.resref.ui,org.jboss.tools.ui.bot.ext.test,org.jboss.tools.common.model.ui.test,org.jboss.tools.common.el.core.test,org.jboss.tools.common.model.ui,org.jboss.tools.tests,org.jboss.tools.common.model.test"/> -<booleanAttribute key="includeOptional" value="true"/> -<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> -<listEntry value="/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageReportingSettingsTest.java"/> -</listAttribute> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> -<listEntry value="1"/> -</listAttribute> -<listAttribute key="org.eclipse.debug.ui.favoriteGroups"> -<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/> -<listEntry value="org.eclipse.debug.ui.launchGroup.run"/> -</listAttribute> -<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/> -<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> -<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> -<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> -<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> -<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.tools.usage.test.GlobalUsageReportingSettingsTest"/> -<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/> -<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.tools.usage.test"/> -<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> -<stringAttribute key="pde.version" value="3.3"/> -<stringAttribute key="product" value="com.jboss.jbds.product.product"/> -<booleanAttribute key="run_in_ui_thread" value="true"/> -<stringAttribute key="selected_target_plugins" value="org.eclipse.jface.text@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.help@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.ltk.ui.refactoring@default:default,com.ibm.icu@default:default,ch.qos.logback.classic@default:default,org.eclipse.ui.editors@default:default,org.eclipse.swt.cocoa.macosx.x86_64@default:false,org.junit4@default:default,javax.mail@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.ui.intro@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.team.ui@default:default,org.eclipse.core.runtime@default:true,org.eclipse.ui.navigator.resources@default:default,org.eclipse.help.base@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse! .swt@default:default,org.eclipse.equinox.common@2:true,org.eclipse.net4j.jms.api@default:default,org.eclipse.equinox.security@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.expressions@default:default,org.apache.lucene.analysis@default:default,org.eclipse.jface@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf@default:default,org.eclipse.update.configurator@3:true,org.eclipse.equinox.p2.repository@default:default,org.apache.jasper@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.p2.metadata@default:default,org.mortbay.jetty.server@default:default,javax.servlet.jsp@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.core.variables@default:default,org.eclipse.help.ui@default:default,org.eclipse.equinox.http.servlet! @default:default,org.eclipse.core.filesystem@default:default,o! rg.mortb ay.jetty.util@default:default,org.eclipse.ui.ide@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.ltk.core.refactoring@default:default,org.apache.commons.el@default:default,org.eclipse.equinox.app@default:default,org.eclipse.osgi@-1:true,org.eclipse.ui.views@default:default,org.eclipse.team.core@default:default,javax.activation@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,javax.servlet@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.equinox.p2.engine@default:default,org.slf4j.api@default:default,org.eclipse.ant.core@default:default,org.eclipse.compare.core@default:default,org.hamcrest.core@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,ch.qos.logback.slf4j@default:false,org.eclipse.equinox.security.macosx@default:fals! e,org.eclipse.ecf.identity@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ecf.ssl@default:false,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.osgi.services@default:default,org.eclipse.ui@default:default,org.eclipse.ui.forms@default:default,org.eclipse.compare@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.text@default:default,org.eclipse.core.databinding.property@default:default,ch.qos.logback.core@default:default,org.eclipse.core.net@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.apache.lucene@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.apache.ant@default:default,org.eclipse.core.jobs@default:default,org.eclipse.e! cf.provider.filetransfer@default:default"/> -<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage@default:default,org.jboss.tools.usage.test@default:default"/> -<booleanAttribute key="show_selected_only" value="false"/> -<stringAttribute key="templateConfig" value="${workspace_loc:org.jboss.tools.usage/config.ini}"/> -<booleanAttribute key="tracing" value="false"/> -<booleanAttribute key="useCustomFeatures" value="false"/> -<booleanAttribute key="useDefaultConfig" value="false"/> -<booleanAttribute key="useDefaultConfigArea" value="false"/> -<booleanAttribute key="useProduct" value="false"/> -</launchConfiguration> Added: trunk/usage/tests/org.jboss.tools.usage.test/GlobalUsageSettingsTest.launch =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/GlobalUsageSettingsTest.launch (rev 0) +++ trunk/usage/tests/org.jboss.tools.usage.test/GlobalUsageSettingsTest.launch 2010-09-15 14:47:58 UTC (rev 24939) @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig"> +<booleanAttribute key="append.args" value="true"/> +<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/> +<booleanAttribute key="askclear" value="false"/> +<booleanAttribute key="automaticAdd" value="true"/> +<booleanAttribute key="automaticValidate" value="false"/> +<stringAttribute key="bootstrap" value=""/> +<stringAttribute key="checked" value="[NONE]"/> +<booleanAttribute key="clearConfig" value="false"/> +<booleanAttribute key="clearws" value="true"/> +<booleanAttribute key="clearwslog" value="false"/> +<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/> +<booleanAttribute key="default" value="false"/> +<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.common.text.xml,org.jboss.tools.common.meta.ui,org.jboss.tools.ui.bot.ext,org.jboss.tools.common,org.jboss.tools.common.verification.ui.test,org.jboss.tools.common.projecttemplates,org.jboss.tools.common.el.core,org.jboss.tools.common.verification.ui,org.jboss.tools.common.gef,org.jboss.tools.common.test,org.jboss.tools.common.verification.test,org.jboss.tools.common.verification,org.jboss.tools.common.model,org.jboss.tools.gwt.ui,org.jboss.tools.common.model.ui.capabilities,org.jboss.tools.common.resref.core,org.jboss.tools.common.ui,org.jboss.tools.common.el.ui,org.jboss.tools.common.text.ext,org.jboss.tools.gwt.core,org.jboss.tools.common.resref.ui,org.jboss.tools.ui.bot.ext.test,org.jboss.tools.common.model.ui.test,org.jboss.tools.common.el.core.test,org.jboss.tools.common.model.ui,org.jboss.tools.tests,org.jboss.tools.common.model.test"/> +<booleanAttribute key="includeOptional" value="true"/> +<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> +<listEntry value="/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageSettingsTest.java"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> +<listEntry value="1"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.ui.favoriteGroups"> +<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/> +<listEntry value="org.eclipse.debug.ui.launchGroup.run"/> +</listAttribute> +<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/> +<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> +<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> +<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> +<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> +<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.tools.usage.test.GlobalUsageSettingsTest"/> +<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.tools.usage.test"/> +<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> +<stringAttribute key="pde.version" value="3.3"/> +<stringAttribute key="product" value="com.jboss.jbds.product.product"/> +<booleanAttribute key="run_in_ui_thread" value="true"/> +<stringAttribute key="selected_target_plugins" value="org.eclipse.jface.text@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.help@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.ltk.ui.refactoring@default:default,com.ibm.icu@default:default,ch.qos.logback.classic@default:default,org.eclipse.ui.editors@default:default,org.eclipse.swt.cocoa.macosx.x86_64@default:false,org.junit4@default:default,javax.mail@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.ui.intro@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.team.ui@default:default,org.eclipse.core.runtime@default:true,org.eclipse.ui.navigator.resources@default:default,org.eclipse.help.base@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse! .swt@default:default,org.eclipse.equinox.common@2:true,org.eclipse.net4j.jms.api@default:default,org.eclipse.equinox.security@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.expressions@default:default,org.apache.lucene.analysis@default:default,org.eclipse.jface@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf@default:default,org.eclipse.update.configurator@3:true,org.eclipse.equinox.p2.repository@default:default,org.apache.jasper@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.p2.metadata@default:default,org.mortbay.jetty.server@default:default,javax.servlet.jsp@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.core.variables@default:default,org.eclipse.help.ui@default:default,org.eclipse.equinox.http.servlet! @default:default,org.eclipse.core.filesystem@default:default,o! rg.mortb ay.jetty.util@default:default,org.eclipse.ui.ide@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.ltk.core.refactoring@default:default,org.apache.commons.el@default:default,org.eclipse.equinox.app@default:default,org.eclipse.osgi@-1:true,org.eclipse.ui.views@default:default,org.eclipse.team.core@default:default,javax.activation@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,javax.servlet@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.equinox.p2.engine@default:default,org.slf4j.api@default:default,org.eclipse.ant.core@default:default,org.eclipse.compare.core@default:default,org.hamcrest.core@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,ch.qos.logback.slf4j@default:false,org.eclipse.equinox.security.macosx@default:fals! e,org.eclipse.ecf.identity@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ecf.ssl@default:false,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.osgi.services@default:default,org.eclipse.ui@default:default,org.eclipse.ui.forms@default:default,org.eclipse.compare@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.text@default:default,org.eclipse.core.databinding.property@default:default,ch.qos.logback.core@default:default,org.eclipse.core.net@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.apache.lucene@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.apache.ant@default:default,org.eclipse.core.jobs@default:default,org.eclipse.e! cf.provider.filetransfer@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage@default:default,org.jboss.tools.usage.test@default:default"/> +<booleanAttribute key="show_selected_only" value="false"/> +<stringAttribute key="templateConfig" value="${workspace_loc:org.jboss.tools.usage/config.ini}"/> +<booleanAttribute key="tracing" value="false"/> +<booleanAttribute key="useCustomFeatures" value="false"/> +<booleanAttribute key="useDefaultConfig" value="false"/> +<booleanAttribute key="useDefaultConfigArea" value="false"/> +<booleanAttribute key="useProduct" value="false"/> +</launchConfiguration> Property changes on: trunk/usage/tests/org.jboss.tools.usage.test/GlobalUsageSettingsTest.launch ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageReportingSettingsTest.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageReportingSettingsTest.java 2010-09-15 14:40:13 UTC (rev 24938) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageReportingSettingsTest.java 2010-09-15 14:47:58 UTC (rev 24939) @@ -1,87 +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.tools.usage.test; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.UnsupportedEncodingException; -import java.net.HttpURLConnection; - -import org.jboss.tools.usage.preferences.GlobalUsageReportingSettings; -import org.junit.Test; - -/** - * Test for the global usage report settings. All tests are disabled yet, - * implementation's unfortunately still buggy. - */ -public class GlobalUsageReportingSettingsTest { - - @Test - public void canExtractEnabledValue() throws IOException { - GlobalReportingSettingsFake reportSettings = new GlobalReportingSettingsFake("true", "", ""); - assertTrue(reportSettings.isEnabled()); - } - - @Test - public void canExtractDisabledValue() throws IOException { - GlobalReportingSettingsFake reportSettings = new GlobalReportingSettingsFake("false", "", ""); - assertFalse(reportSettings.isEnabled()); - } - - @Test - public void canExtractDisabledOutUndefinedValue() throws IOException { - GlobalReportingSettingsFake reportEnablement = new GlobalReportingSettingsFake("Rubbish", "", ""); - assertFalse(reportEnablement.isEnabled()); - } - - private class GlobalReportingSettingsFake extends GlobalUsageReportingSettings { - - private String enablementValue; - private String integerValue; - private String stringValue; - - public GlobalReportingSettingsFake(String enablementValue, String dummyValue, String anotherValue) - throws IOException { - super(JBossToolsUsageTestActivator.getDefault()); - this.enablementValue = enablementValue; - this.stringValue = dummyValue; - this.integerValue = anotherValue; - } - - @Override - protected InputStreamReader request(HttpURLConnection urlConnection) throws UnsupportedEncodingException { - return new InputStreamReader(new ByteArrayInputStream(getEnablementPageContent(enablementValue, - stringValue, integerValue).getBytes()), "UTF-8"); - } - } - - private String getEnablementPageContent(String enablementValue, String dummyValue, String integerValue) { - - return "some rubbish at the beginning..." - + GlobalUsageReportingSettings.REPORT_ENABLEMENT_KEY - + enablementValue - + "\n" - + "#" - + "some rubbish at the end"; - - } - - @Test - public void isPageAccessible() throws IOException { - GlobalUsageReportingSettings reportEnablement = new GlobalUsageReportingSettings(JBossToolsUsageTestActivator - .getDefault()); - System.err.println("Usage reporting is globally \"" + reportEnablement.isEnabled() + "\""); - } -} Copied: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageSettingsTest.java (from rev 24605, trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageReportingSettingsTest.java) =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageSettingsTest.java (rev 0) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageSettingsTest.java 2010-09-15 14:47:58 UTC (rev 24939) @@ -0,0 +1,120 @@ +/******************************************************************************* + * 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.usage.test; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.UnsupportedEncodingException; +import java.net.HttpURLConnection; + +import org.eclipse.core.runtime.Plugin; +import org.jboss.tools.usage.http.HttpRemotePropertiesProvider; +import org.jboss.tools.usage.preferences.GlobalUsageSettings; +import org.junit.Test; + +/** + * Test for the global usage report settings. All tests are disabled yet, + * implementation's unfortunately still buggy. + */ +public class GlobalUsageSettingsTest { + + @Test + public void canExtractEnabledValue() throws IOException { + GlobalUsageSettingsFake reportSettings = new GlobalUsageSettingsFake("true", "", ""); + assertTrue(reportSettings.isAllInstancesReportingEnabled()); + } + + @Test + public void canExtractDisabledValue() throws IOException { + GlobalUsageSettingsFake reportSettings = new GlobalUsageSettingsFake("false", "", ""); + assertFalse(reportSettings.isAllInstancesReportingEnabled()); + } + + @Test + public void canExtractDisabledOutUndefinedValue() throws IOException { + GlobalUsageSettingsFake reportEnablement = new GlobalUsageSettingsFake("Rubbish", "", ""); + assertFalse(reportEnablement.isAllInstancesReportingEnabled()); + } + + @Test + public void instanceReportingIsEnabledIfSysPropIsNotSet() throws IOException { + GlobalUsageSettingsFake reportEnablement = new GlobalUsageSettingsFake("", "", ""); + assertTrue(reportEnablement.isInstanceReportingEnabled()); + } + + @Test + public void instanceReportingIsDisabledIfSysPropIsFalse() throws IOException { + GlobalUsageSettingsFake reportEnablement = new GlobalUsageSettingsFake("", "", ""); + System.setProperty(GlobalUsageSettings.SYSPROPS_INSTANCE_ENABLED_KEY, Boolean.FALSE.toString()); + assertFalse(reportEnablement.isInstanceReportingEnabled()); + } + + @Test + public void instanceReportingIsEnabledIfSysPropIsTrue() throws IOException { + GlobalUsageSettingsFake reportEnablement = new GlobalUsageSettingsFake("", "", ""); + System.setProperty(GlobalUsageSettings.SYSPROPS_INSTANCE_ENABLED_KEY, Boolean.TRUE.toString()); + assertTrue(reportEnablement.isInstanceReportingEnabled()); + } + + private class GlobalUsageSettingsFake extends GlobalUsageSettings { + + private String allInstancesEnabledValue; + private String integerValue; + private String stringValue; + + public GlobalUsageSettingsFake(String allInstancesEnabledValue, String dummyValue, String anotherValue) + throws IOException { + super(JBossToolsUsageTestActivator.getDefault()); + this.allInstancesEnabledValue = allInstancesEnabledValue; + this.stringValue = dummyValue; + this.integerValue = anotherValue; + } + + @Override + protected HttpRemotePropertiesProvider createRemoteMap(String url, char valueDelimiter, Plugin plugin, + String... keys) { + return new HttpRemotePropertiesProvider(url, valueDelimiter, plugin, keys) { + @Override + protected InputStreamReader request(HttpURLConnection urlConnection) + throws UnsupportedEncodingException { + return new InputStreamReader(new ByteArrayInputStream( + getRemotePropertiesRawData( + allInstancesEnabledValue + , stringValue + , integerValue).getBytes()) + , "UTF-8"); + } + }; + } + } + + private String getRemotePropertiesRawData(String enablementValue, String dummyValue, String integerValue) { + + return "some rubbish at the beginning..." + + GlobalUsageSettings.REMOTEPROPS_ALLINSTANCES_ENABLED_KEY + + enablementValue + + "\n" + + "#" + + "some rubbish at the end"; + + } + + @Test + public void isPageAccessible() throws IOException { + GlobalUsageSettings reportEnablement = new GlobalUsageSettings(JBossToolsUsageTestActivator + .getDefault()); + System.err.println("Usage reporting is globally \"" + reportEnablement.isAllInstancesReportingEnabled() + "\""); + } +} Property changes on: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageSettingsTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageTestSuite.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageTestSuite.java 2010-09-15 14:40:13 UTC (rev 24938) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageTestSuite.java 2010-09-15 14:47:58 UTC (rev 24939) @@ -24,7 +24,7 @@ EclipseUserAgentTest.class, ReportingEclipseEnvironmentTest.class, JBossToolsComponentsTest.class, - GlobalUsageReportingSettingsTest.class, + GlobalUsageSettingsTest.class, JBossToolsUsageIntegrationTest.class }) public class UsageTestSuite { } \ No newline at end of file

15 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r24938 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test: src/org/jboss/tools/cdi/core/test and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2010-09-15 10:40:13 -0400 (Wed, 15 Sep 2010) New Revision: 24938 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/META-INF/weld-beans.xml Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/BeansXMLTest.java Log: JBIDE-6998 https://jira.jboss.org/browse/JBIDE-6998 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/META-INF/weld-beans.xml =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/META-INF/weld-beans.xml (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/META-INF/weld-beans.xml 2010-09-15 14:40:13 UTC (rev 24938) @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<beans xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:weld="http://jboss.org/schema/weld/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation=" http://java.sun.com/xml/ns/javaee http://jboss.org/schema/cdi/beans_1_0.xsd http://jboss.org/schema/weld/beans http://jboss.org/schema/weld/beans_1_1.xsd"> + <weld:scan> + <weld:include pattern="cls1"/> + <weld:include name="cls2"/> + <weld:exclude name="cls3"/> + <weld:exclude pattern="cls4"/> + </weld:scan> + <alternatives> + <class>test.MyS2</class> + </alternatives> +</beans> Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/META-INF/weld-beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/BeansXMLTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/BeansXMLTest.java 2010-09-15 14:39:14 UTC (rev 24937) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/BeansXMLTest.java 2010-09-15 14:40:13 UTC (rev 24938) @@ -48,6 +48,43 @@ assertNotNull(o); } + public void testWeldBeansXML() throws CoreException, IOException { + IFile file = project.getFile(new Path("META-INF/weld-beans.xml")); + assertNotNull(file); + XModelObject beansXML = EclipseResourceUtil.createObjectForResource(file); + assertNotNull(beansXML); + + assertEquals("FileCDIBeans", beansXML.getModelEntity().getName()); + + XModelObject scan = beansXML.getChildByPath("Scan"); + assertNotNull(scan); + + XModelObject include1 = scan.getChildByPath("cls1"); + assertNotNull(include1); + assertEquals("CDIWeldInclude", include1.getModelEntity().getName()); + String pattern1 = include1.getAttributeValue("pattern"); + assertEquals("cls1", pattern1); + + XModelObject include2 = scan.getChildByPath("cls2"); + assertNotNull(include2); + assertEquals("CDIWeldInclude", include2.getModelEntity().getName()); + String name2 = include2.getAttributeValue("name"); + assertEquals("cls2", name2); + + XModelObject exclude3 = scan.getChildByPath("cls3"); + assertNotNull(exclude3); + assertEquals("CDIWeldExclude", exclude3.getModelEntity().getName()); + String name3 = exclude3.getAttributeValue("name"); + assertEquals("cls3", name3); + + XModelObject exclude4 = scan.getChildByPath("cls4"); + assertNotNull(exclude4); + assertEquals("CDIWeldExclude", exclude4.getModelEntity().getName()); + String pattern4 = exclude4.getAttributeValue("pattern"); + assertEquals("cls4", pattern4); + + } + public void tearDown() throws Exception { boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); JobUtils.waitForIdle();

15 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r24937 - workspace/usage.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2010-09-15 10:39:14 -0400 (Wed, 15 Sep 2010) New Revision: 24937 Modified: workspace/usage/usage.properties Log: [JBIDE-6953] renamed key to differentiate clearly from local kill-switch Modified: workspace/usage/usage.properties =================================================================== --- workspace/usage/usage.properties 2010-09-15 14:17:32 UTC (rev 24936) +++ workspace/usage/usage.properties 2010-09-15 14:39:14 UTC (rev 24937) @@ -1,2 +1,2 @@ -allinstances_enabled=true +usage_allinstances_enabled=true #

15 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r24936 - trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/handlers.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2010-09-15 10:17:32 -0400 (Wed, 15 Sep 2010) New Revision: 24936 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/handlers/AddIncludeSupport.java Log: https://jira.jboss.org/browse/JBIDE-6998 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/handlers/AddIncludeSupport.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/handlers/AddIncludeSupport.java 2010-09-15 13:44:32 UTC (rev 24935) +++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/handlers/AddIncludeSupport.java 2010-09-15 14:17:32 UTC (rev 24936) @@ -3,7 +3,9 @@ import java.util.Properties; import org.jboss.tools.common.meta.XChild; +import org.jboss.tools.common.meta.action.impl.DefaultWizardDataValidator; import org.jboss.tools.common.meta.action.impl.SpecialWizardSupport; +import org.jboss.tools.common.meta.action.impl.WizardDataValidator; import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler; import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; @@ -51,4 +53,21 @@ return null; } + protected DefaultWizardDataValidator validator = new Validator(); + + public WizardDataValidator getValidator(int step) { + validator.setSupport(this, step); + return validator; + } + + class Validator extends DefaultWizardDataValidator { + public void validate(Properties data) { + boolean isRegEx = "true".equals(data.getProperty("is regular expression")); + String nameValue = data.getProperty("name/pattern"); + String nameAttr = isRegEx ? "pattern" : "name"; + data.setProperty(nameAttr, nameValue); + super.validate(data); + } + + } }

15 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r24935 - workspace/usage.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2010-09-15 09:44:32 -0400 (Wed, 15 Sep 2010) New Revision: 24935 Modified: workspace/usage/usage.properties Log: [JBIDE-6953] renamed key to differentiate clearly from local kill-switch Modified: workspace/usage/usage.properties =================================================================== --- workspace/usage/usage.properties 2010-09-15 13:43:21 UTC (rev 24934) +++ workspace/usage/usage.properties 2010-09-15 13:44:32 UTC (rev 24935) @@ -1,2 +1,2 @@ -usage_reporting_enabled=true +allinstances_enabled=true #

15 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r24934 - workspace.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2010-09-15 09:43:21 -0400 (Wed, 15 Sep 2010) New Revision: 24934 Removed: workspace/usage.properties Log: [JBIDE-6953] deleted unused property Deleted: workspace/usage.properties =================================================================== --- workspace/usage.properties 2010-09-15 12:13:42 UTC (rev 24933) +++ workspace/usage.properties 2010-09-15 13:43:21 UTC (rev 24934) @@ -1,2 +0,0 @@ -usageReportingEnabled=true -#

15 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r24933 - trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2010-09-15 08:13:42 -0400 (Wed, 15 Sep 2010) New Revision: 24933 Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamEARTest.java Log: https://jira.jboss.org/browse/JBIDE-7066 Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamEARTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamEARTest.java 2010-09-15 12:12:42 UTC (rev 24932) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamEARTest.java 2010-09-15 12:13:42 UTC (rev 24933) @@ -84,6 +84,12 @@ assertNotNull("War project must see component 'authenticator' declared in ejb project", c); } + /** + * See https://jira.jboss.org/browse/JBIDE-7066 + * Seam model is not loaded if there are two dependent Seam projects and one of them has been cleaned. + * + * @throws CoreException + */ public void testCleanEarProject() throws CoreException { ISeamProject seamProject = getSeamProject(projectWAR); ISeamComponent c = seamProject.getComponent("authenticator");

15 years, 7 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits September 2010