September 2010 - jbosstools-commits

JBoss Tools SVN: r24922 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui: src/org/jboss/tools/deltacloud/ui and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: jjohnstn Date: 2010-09-14 14:02:15 -0400 (Tue, 14 Sep 2010) New Revision: 24922 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/DeltaCloudPerspective.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java Log: 2010-09-14 Jeff Johnston <jjohnstn(a)redhat.com> * src/org/jboss/tools/deltacloud/ui/DeltaCloudPerspective.java (createInitialLayout): Fix initial view placement by putting all the bottom views into a single folder. * src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties: Fix message for refreshing of cloud. * src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java (fillContextMenu): Add disconnect cloud for any object. Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-09-14 17:01:07 UTC (rev 24921) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-09-14 18:02:15 UTC (rev 24922) @@ -1,3 +1,12 @@ +2010-09-14 Jeff Johnston <jjohnstn(a)redhat.com> + + * src/org/jboss/tools/deltacloud/ui/DeltaCloudPerspective.java (createInitialLayout): Fix + initial view placement by putting all the bottom views into a single folder. + * src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties: Fix message for + refreshing of cloud. + * src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java (fillContextMenu): Add + disconnect cloud for any object. + 2010-09-13 Jeff Johnston <jjohnstn(a)redhat.com> * src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties: Add new messages Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/DeltaCloudPerspective.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/DeltaCloudPerspective.java 2010-09-14 17:01:07 UTC (rev 24921) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/DeltaCloudPerspective.java 2010-09-14 18:02:15 UTC (rev 24922) @@ -10,6 +10,7 @@ *******************************************************************************/ package org.jboss.tools.deltacloud.ui; +import org.eclipse.ui.IFolderLayout; import org.eclipse.ui.IPageLayout; import org.eclipse.ui.IPerspectiveFactory; @@ -19,12 +20,11 @@ public void createInitialLayout(IPageLayout layout) { layout.addView("org.jboss.tools.deltacloud.ui.views.CloudView", IPageLayout.LEFT, 0.25f, IPageLayout.ID_EDITOR_AREA); - layout.addView(IPageLayout.ID_PROP_SHEET, IPageLayout.BOTTOM, - 0.80f, IPageLayout.ID_EDITOR_AREA); - layout.addView("org.jboss.tools.deltacloud.ui.views.InstanceView", IPageLayout.BOTTOM, - 0.80f, IPageLayout.ID_EDITOR_AREA); - layout.addView("org.jboss.tools.deltacloud.ui.views.ImageView", IPageLayout.BOTTOM, - 0.80f, IPageLayout.ID_EDITOR_AREA); + IFolderLayout bottom = + layout.createFolder("bottom", IPageLayout.BOTTOM, 0.80f, IPageLayout.ID_EDITOR_AREA); //$NON-NLS-1$ + bottom.addView(IPageLayout.ID_PROP_SHEET); + bottom.addView("org.jboss.tools.deltacloud.ui.views.InstanceView"); //$NON-NLS-1$ + bottom.addView("org.jboss.tools.deltacloud.ui.views.ImageView"); //$NON-NLS-1$ } } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties 2010-09-14 17:01:07 UTC (rev 24921) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties 2010-09-14 18:02:15 UTC (rev 24922) @@ -31,7 +31,7 @@ CloudSelector.label=Select Cloud: RemoveCloud.label=Disconnect Cloud -Refresh.label=Refresh View +Refresh.label=Refresh Cloud CreateInstance.label=Launch Instance DeleteInstance.label=Delete Instance ShowInRSE.label=Show in Remote System Explorer 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-09-14 17:01:07 UTC (rev 24921) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java 2010-09-14 18:02:15 UTC (rev 24922) @@ -162,6 +162,7 @@ } else if (selectedElement instanceof CVInstanceElement){ //TODO: add meaningful actions here } + manager.add(removeCloud); // Other plug-ins can contribute there actions here manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS)); }

15 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r24921 - in trunk/usage/plugins/org.jboss.tools.usage: src/org/jboss/tools/usage and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2010-09-14 13:01:07 -0400 (Tue, 14 Sep 2010) New Revision: 24921 Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpMessages.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/messages.properties trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/LoggingUtils.java Modified: trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/PluginLogger.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/Tracker.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/UsageMessages.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/GoogleAnalyticsEclipseMessages.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpGetRequest.java 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/messages.properties trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/BundleUtils.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/StatusUtils.java Log: [JBIDE-7024] Added check if plugin has tracing enabled (for INFO output only), corrected localisation (message locations) Modified: trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch 2010-09-14 15:50:27 UTC (rev 24920) +++ trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch 2010-09-14 17:01:07 UTC (rev 24921) @@ -7,7 +7,7 @@ <stringAttribute key="bootstrap" value=""/> <stringAttribute key="checked" value="[NONE]"/> <booleanAttribute key="clearConfig" value="true"/> -<booleanAttribute key="clearws" value="true"/> +<booleanAttribute key="clearws" value="false"/> <booleanAttribute key="clearwslog" value="false"/> <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/JBoss Usage Reporter"/> <booleanAttribute key="default" value="true"/> @@ -15,12 +15,12 @@ <booleanAttribute key="includeOptional" value="true"/> <stringAttribute key="location" value="${workspace_loc}/../runtime-EclipseApplication2"/> <listAttribute key="org.eclipse.debug.ui.favoriteGroups"> +<listEntry value="org.eclipse.debug.ui.launchGroup.run"/> <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/> -<listEntry value="org.eclipse.debug.ui.launchGroup.run"/> </listAttribute> <stringAttribute key="org.eclipse.jdt.launching.JAVA_COMMAND" value="java"/> <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> -<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -console -consolelog -pluginCustomization ${workspace_loc}/../runtime-EclipseApplication/usage.properties"/> +<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -console -consolelog -pluginCustomization ${workspace_loc}/../runtime-EclipseApplication/usage.properties -debug"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> <booleanAttribute key="pde.generated.config" value="false"/> <stringAttribute key="pde.version" value="3.3"/> @@ -29,7 +29,7 @@ <stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage@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="tracing" value="true"/> <booleanAttribute key="useCustomFeatures" value="false"/> <booleanAttribute key="useDefaultConfig" value="false"/> <booleanAttribute key="useDefaultConfigArea" value="true"/> Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/PluginLogger.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/PluginLogger.java 2010-09-14 15:50:27 UTC (rev 24920) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/PluginLogger.java 2010-09-14 17:01:07 UTC (rev 24921) @@ -13,15 +13,19 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Plugin; import org.eclipse.core.runtime.Status; +import org.jboss.tools.usage.util.LoggingUtils; /** * @author Andre Dietisheim */ public class PluginLogger implements ILoggingAdapter { + private final boolean tracingEnabled; + private Plugin plugin; public PluginLogger(Plugin plugin) { + this.tracingEnabled = LoggingUtils.isPluginTracingEnabled(plugin); this.plugin = plugin; } @@ -34,6 +38,10 @@ } private void log(int severity, String message) { + if (!tracingEnabled) { + return; + } + if (plugin != null) { IStatus status = new Status(severity, plugin.getBundle().getSymbolicName(), message); plugin.getLog().log(status); Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/Tracker.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/Tracker.java 2010-09-14 15:50:27 UTC (rev 24920) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/Tracker.java 2010-09-14 17:01:07 UTC (rev 24921) @@ -41,7 +41,7 @@ try { httpRequest.request(getTrackingUrl(focusPoint)); } catch (Exception e) { - loggingAdapter.logMessage(MessageFormat.format(UsageMessages.Tracker_Error, e.getMessage())); + loggingAdapter.logError(MessageFormat.format(UsageMessages.Tracker_Error, e.getMessage())); } } @@ -66,7 +66,7 @@ try { httpRequest.request(getTrackingUrl(focusPoint)); } catch (Exception e) { - loggingAdapter.logMessage(MessageFormat.format(UsageMessages.Tracker_Error, e.getMessage())); + loggingAdapter.logError(MessageFormat.format(UsageMessages.Tracker_Error, e.getMessage())); } } } Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/UsageMessages.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/UsageMessages.java 2010-09-14 15:50:27 UTC (rev 24920) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/UsageMessages.java 2010-09-14 17:01:07 UTC (rev 24921) @@ -18,14 +18,6 @@ public static String Tracker_Asynchronous; public static String Tracker_Error; - public static String HttpGetMethod_Error_Http; - public static String HttpGetMethod_Error_Io; - public static String HttpGetMethod_Success; - - public static String KillSwitchPreference_Error_Exception; - public static String KillSwitchPreference_Error_Http; - public static String KillSwitchPreference_Info_HttpQuery; - static { // initialize resource bundle NLS.initializeMessages(BUNDLE_NAME, UsageMessages.class); Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/GoogleAnalyticsEclipseMessages.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/GoogleAnalyticsEclipseMessages.java 2010-09-14 15:50:27 UTC (rev 24920) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/GoogleAnalyticsEclipseMessages.java 2010-09-14 17:01:07 UTC (rev 24921) @@ -17,7 +17,7 @@ */ public class GoogleAnalyticsEclipseMessages extends NLS { - private static final String BUNDLE_NAME = "org.jboss.tools.usage.googleanalytics.messages"; //$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.jboss.tools.usage.googleanalytics.eclipse.messages"; //$NON-NLS-1$ public static String EclipseEnvironment_Error_SavePreferences; Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpGetRequest.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpGetRequest.java 2010-09-14 15:50:27 UTC (rev 24920) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpGetRequest.java 2010-09-14 17:01:07 UTC (rev 24921) @@ -16,7 +16,6 @@ import java.text.MessageFormat; import org.jboss.tools.usage.ILoggingAdapter; -import org.jboss.tools.usage.UsageMessages; /** * Class that executes a HTTP Get request to the given url. @@ -54,12 +53,12 @@ urlConnection.connect(); int responseCode = getResponseCode(urlConnection); if (responseCode == HttpURLConnection.HTTP_OK) { - loggingAdapter.logMessage(MessageFormat.format(UsageMessages.HttpGetMethod_Success, urlString, responseCode)); + loggingAdapter.logMessage(MessageFormat.format(HttpMessages.HttpGetMethod_Success, urlString, responseCode)); } else { - loggingAdapter.logError(MessageFormat.format(UsageMessages.HttpGetMethod_Error_Http, urlString)); + loggingAdapter.logError(MessageFormat.format(HttpMessages.HttpGetMethod_Error_Http, urlString)); } } catch (Exception e) { - loggingAdapter.logMessage(MessageFormat.format(UsageMessages.HttpGetMethod_Error_Io, urlString, e.toString())); + loggingAdapter.logMessage(MessageFormat.format(HttpMessages.HttpGetMethod_Error_Io, urlString, e.toString())); } finally { // setCookieHandler(currentCookieHandler); } Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpMessages.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpMessages.java (rev 0) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpMessages.java 2010-09-14 17:01:07 UTC (rev 24921) @@ -0,0 +1,33 @@ +/******************************************************************************* + * 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 org.eclipse.osgi.util.NLS; + +public class HttpMessages extends NLS { + private static final String BUNDLE_NAME = "org.jboss.tools.usage.http.messages"; //$NON-NLS-1$ + + public static String HttpGetMethod_Error_Http; + public static String HttpGetMethod_Error_Io; + public static String HttpGetMethod_Success; + + public static String HttpResourceMap_Error_Exception; + public static String HttpResourceMap_Error_Http; + public static String HttpResourceMap_Info_HttpQuery; + + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, HttpMessages.class); + } + + private HttpMessages() { + } +} Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpMessages.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: 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-14 15:50:27 UTC (rev 24920) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpResourceMap.java 2010-09-14 17:01:07 UTC (rev 24921) @@ -22,8 +22,8 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Plugin; -import org.jboss.tools.usage.UsageMessages; 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; @@ -81,23 +81,23 @@ urlConnection.connect(); int responseCode = getResponseCode(urlConnection); if (responseCode == HttpURLConnection.HTTP_OK) { - IStatus status = StatusUtils.getDebugStatus( + IStatus status = StatusUtils.getInfoStatus( plugin.getBundle().getSymbolicName() - , UsageMessages.KillSwitchPreference_Info_HttpQuery + , HttpMessages.HttpResourceMap_Info_HttpQuery , url); - plugin.getLog().log(status); + LoggingUtils.log(status, plugin); responseReader = getInputStreamReader(urlConnection.getInputStream(), urlConnection.getContentType()); } else { IStatus status = StatusUtils.getErrorStatus( plugin.getBundle().getSymbolicName() - , UsageMessages.KillSwitchPreference_Error_Http, null, url); + , HttpMessages.HttpGetMethod_Error_Http, null, url); plugin.getLog().log(status); } return responseReader; } catch (IOException e) { IStatus status = StatusUtils.getErrorStatus( plugin.getBundle().getSymbolicName() - , UsageMessages.KillSwitchPreference_Error_Http, e, url); + , HttpMessages.HttpGetMethod_Error_Http, e, url); plugin.getLog().log(status); throw e; } Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/messages.properties =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/messages.properties (rev 0) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/messages.properties 2010-09-14 17:01:07 UTC (rev 24921) @@ -0,0 +1,7 @@ +HttpResourceMap_Error_Exception=Could not query properties at \"{0}\" +HttpResourceMap_Error_Http=Could not query properties at \"{0}\, response code was \"{1}\"" +HttpResourceMap_Info_HttpQuery=Queried properties at \"{0}\" + +HttpGetMethod_Error_Http=HTTP GET to \"{0}\" failed, response code received \"{1}\" +HttpGetMethod_Error_Io=HTTP GET to "{0}" failed, exception occured\: "{1}" +HttpGetMethod_Success=HTTP GET to url "{0}" successfull\! Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/messages.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/messages.properties =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/messages.properties 2010-09-14 15:50:27 UTC (rev 24920) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/messages.properties 2010-09-14 17:01:07 UTC (rev 24921) @@ -1,11 +1,3 @@ -HttpGetMethod_Error_Http=HTTP GET to \"{0}\" failed, response code received \"{1}\" -HttpGetMethod_Error_Io=HTTP GET to \"{0}\" failed, exception occured: \"{1}\" -HttpGetMethod_Success=HTTP GET to url \"{0}\" successfull\! - Tracker_Asynchronous=Tracking asynchronously focusPoint \"{0}\" -Tracker_Error=Tracking failed, exception thrown: \"{0}\" -Tracker_Synchronous=Tracking synchronously focusPoint \"{0}\" - -KillSwitchPreference_Error_Exception=Could not query kill switch preference at \"{0}\" -KillSwitchPreference_Error_Http=Could not query kill switch preference at \"{0}\, response code was \"{1}\"" -KillSwitchPreference_Info_HttpQuery=Queried kill switch preference at \"{0}\" +Tracker_Error=Tracking failed, exception thrown\: "{0}" +Tracker_Synchronous=Tracking synchronously focusPoint \"{0}\" \ No newline at end of file Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/BundleUtils.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/BundleUtils.java 2010-09-14 15:50:27 UTC (rev 24920) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/BundleUtils.java 2010-09-14 17:01:07 UTC (rev 24921) @@ -69,6 +69,5 @@ return pattern.matcher(bundle.getSymbolicName()).matches(); } - } } Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/LoggingUtils.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/LoggingUtils.java (rev 0) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/LoggingUtils.java 2010-09-14 17:01:07 UTC (rev 24921) @@ -0,0 +1,31 @@ +/******************************************************************************* + * 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.util; + +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Plugin; + +/** + * @author Andre Dietisheim + */ +public class LoggingUtils { + + public static boolean isPluginTracingEnabled(Plugin plugin) { + return plugin != null && plugin.isDebugging(); + } + + public static void log(IStatus status, Plugin plugin) { + if (status.getSeverity() == IStatus.INFO && !isPluginTracingEnabled(plugin)) { + return; + } + plugin.getLog().log(status); + } +} Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/LoggingUtils.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/StatusUtils.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/StatusUtils.java 2010-09-14 15:50:27 UTC (rev 24920) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/StatusUtils.java 2010-09-14 17:01:07 UTC (rev 24921) @@ -59,7 +59,7 @@ * * @return the debug status */ - public static IStatus getDebugStatus(String pluginId, String message, Object... messageArguments) { + public static IStatus getInfoStatus(String pluginId, String message, Object... messageArguments) { return new Status(Status.INFO, pluginId, Status.INFO, MessageFormat.format(message, messageArguments), null); } @@ -74,7 +74,7 @@ public static IStatus clone(IStatus status) { switch (status.getSeverity()) { case IStatus.INFO: - return getDebugStatus(status.getPlugin(), status.getMessage()); + return getInfoStatus(status.getPlugin(), status.getMessage()); case IStatus.ERROR: return getErrorStatus(status.getPlugin(), status.getMessage(), status.getException()); default:

15 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r24920 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2010-09-14 11:50:27 -0400 (Tue, 14 Sep 2010) New Revision: 24920 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/ELValidator.java Log: https://jira.jboss.org/browse/JBIDE-7067 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/ELValidator.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/ELValidator.java 2010-09-14 15:34:17 UTC (rev 24919) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/ELValidator.java 2010-09-14 15:50:27 UTC (rev 24920) @@ -230,7 +230,7 @@ currentSources = EclipseResourceUtil.getJavaSourceRoots(project); } // Validate all files from java source folders. - for (int i = 0; i < currentSources.length; i++) { + for (int i = 0; currentSources!=null && i < currentSources.length; i++) { if(currentSources[i].getLocation().isPrefixOf(file.getLocation())) { return true; }

15 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r24919 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2010-09-14 11:34:17 -0400 (Tue, 14 Sep 2010) New Revision: 24919 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/ELValidator.java Log: https://jira.jboss.org/browse/JBIDE-7067 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/ELValidator.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/ELValidator.java 2010-09-14 15:29:43 UTC (rev 24918) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/ELValidator.java 2010-09-14 15:34:17 UTC (rev 24919) @@ -106,6 +106,7 @@ resolvers = ELResolverFactoryManager.getInstance().getResolvers(project); mainFactory = ELParserUtil.getDefaultFactory(); validateVars = JSFSeverityPreferences.ENABLE.equals(JSFSeverityPreferences.getInstance().getProjectPreference(validatingProject, JSFSeverityPreferences.CHECK_VARS)); + currentProject = null; } /* @@ -196,6 +197,7 @@ IProject project = file.getProject(); if(currentProject==null || !project.equals(currentProject)) { enabled = isEnabled(project); + currentProject = project; } if(!enabled) { return false;

15 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r24918 - trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/editor/form.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2010-09-14 11:29:43 -0400 (Tue, 14 Sep 2010) New Revision: 24918 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/editor/form/CDIBeansFileFormLayoutData.java trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/editor/form/CDIXMLFormLayoutData.java Log: https://jira.jboss.org/browse/JBIDE-6998 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/editor/form/CDIBeansFileFormLayoutData.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/editor/form/CDIBeansFileFormLayoutData.java 2010-09-14 15:27:36 UTC (rev 24917) +++ trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/editor/form/CDIBeansFileFormLayoutData.java 2010-09-14 15:29:43 UTC (rev 24918) @@ -59,6 +59,21 @@ ), }; + static IFormData getIncludeExcludeDefinition(String title) { + return new FormData( + title, + CDIXMLFormLayoutData.EMPTY_DESCRIPTION, + new FormAttributeData[]{new FormAttributeData("element type", 20, "Kind"), new FormAttributeData("name/pattern", 80)}, //$NON-NLS-1$ + new String[]{"CDIWeldInclude", "CDIWeldExclude"}, + FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddItem") //$NON-NLS-1$ + ); + } + + private final static IFormData[] WELD_SCAN_DEFINITIONS = new IFormData[] { + getIncludeExcludeDefinition("Include/Exclude") //$NON-NLS-1$ + }; + + final static IFormData FILE_20_FORM_DEFINITION = new FormData( ENT_CDI_BEANS, new String[]{null}, FILE_10_DEFINITIONS); @@ -71,4 +86,7 @@ final static IFormData ALTERNATIVES_DEFINITION = new FormData( ENT_ALTERNATIVES, new String[]{null}, ALTERNATIVES_DEFINITIONS); + final static IFormData WELD_SCAN_DEFINITION = new FormData( + "CDIWeldScan", new String[]{null}, WELD_SCAN_DEFINITIONS); + } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/editor/form/CDIXMLFormLayoutData.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/editor/form/CDIXMLFormLayoutData.java 2010-09-14 15:27:36 UTC (rev 24917) +++ trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/editor/form/CDIXMLFormLayoutData.java 2010-09-14 15:29:43 UTC (rev 24918) @@ -25,7 +25,9 @@ CDIBeansFileFormLayoutData.FILE_20_FORM_DEFINITION, CDIBeansFileFormLayoutData.DECORATORS_DEFINITION, CDIBeansFileFormLayoutData.INTERCEPTORS_DEFINITION, - CDIBeansFileFormLayoutData.ALTERNATIVES_DEFINITION + CDIBeansFileFormLayoutData.ALTERNATIVES_DEFINITION, + + CDIBeansFileFormLayoutData.WELD_SCAN_DEFINITION }; private static Map<String,IFormData> FORM_LAYOUT_DEFINITION_MAP = Collections.synchronizedMap(new ArrayToMap(FORM_LAYOUT_DEFINITIONS));

15 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r24917 - in trunk/cdi/plugins/org.jboss.tools.cdi.xml: META-INF and 6 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2010-09-14 11:27:36 -0400 (Tue, 14 Sep 2010) New Revision: 24917 Added: trunk/cdi/plugins/org.jboss.tools.cdi.xml/images/ trunk/cdi/plugins/org.jboss.tools.cdi.xml/images/exclude.gif trunk/cdi/plugins/org.jboss.tools.cdi.xml/images/include.gif trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/meta/cdi-weld.meta trunk/cdi/plugins/org.jboss.tools.cdi.xml/schemas/beans_1_1.xsd 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/handlers/ trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/handlers/AddIncludeSupport.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/META-INF/MANIFEST.MF trunk/cdi/plugins/org.jboss.tools.cdi.xml/build.properties trunk/cdi/plugins/org.jboss.tools.cdi.xml/plugin.xml trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/help/keys-cdi-attrs.properties trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/help/keys-cdi.properties Log: https://jira.jboss.org/browse/JBIDE-6998 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/META-INF/MANIFEST.MF =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.xml/META-INF/MANIFEST.MF 2010-09-14 15:06:48 UTC (rev 24916) +++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/META-INF/MANIFEST.MF 2010-09-14 15:27:36 UTC (rev 24917) @@ -7,7 +7,8 @@ Bundle-SymbolicName: org.jboss.tools.cdi.xml;singleton:=true Bundle-Localization: plugin Export-Package: org.jboss.tools.cdi.xml, - org.jboss.tools.cdi.xml.beans.model + org.jboss.tools.cdi.xml.beans.model, + org.jboss.tools.cdi.xml.beans.model.handlers Require-Bundle: org.jboss.tools.jst.web;visibility:=reexport, org.eclipse.ui.ide, org.eclipse.ui.views, Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/build.properties =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.xml/build.properties 2010-09-14 15:06:48 UTC (rev 24916) +++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/build.properties 2010-09-14 15:27:36 UTC (rev 24917) @@ -3,7 +3,8 @@ plugin.properties,\ about.html,\ schemas/,\ - . + .,\ + images/ jars.compile.order = . src.includes = src/,\ schemas/,\ @@ -12,7 +13,8 @@ plugin.properties,\ build.properties,\ about.html,\ - META-INF/ + META-INF/,\ + images/ output.. = bin/ source.. = resources/,\ src/ Added: trunk/cdi/plugins/org.jboss.tools.cdi.xml/images/exclude.gif =================================================================== (Binary files differ) Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.xml/images/exclude.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/cdi/plugins/org.jboss.tools.cdi.xml/images/include.gif =================================================================== (Binary files differ) Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.xml/images/include.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/plugin.xml =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.xml/plugin.xml 2010-09-14 15:06:48 UTC (rev 24916) +++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/plugin.xml 2010-09-14 15:27:36 UTC (rev 24917) @@ -4,6 +4,7 @@ <extension point="org.jboss.tools.common.model.meta"> <meta path="meta/cdi-beans.meta"/> + <meta path="meta/cdi-weld.meta"/> </extension> <extension point="org.jboss.tools.common.model.keys"> @@ -19,7 +20,12 @@ 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"/> + </extension> <extension point="org.eclipse.wst.xml.core.catalogContributions"> Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/help/keys-cdi-attrs.properties =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/help/keys-cdi-attrs.properties 2010-09-14 15:06:48 UTC (rev 24916) +++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/help/keys-cdi-attrs.properties 2010-09-14 15:27:36 UTC (rev 24917) @@ -1,163 +1,5 @@ -Seam.element_type=Element Type -Seam.name=Name -Seam.thread-pool-size=Thread-Pool-Size -Seam.component-name=Component-Name -Seam.extension=Extension -Seam.xmlns=Xmlns -Seam.xmlns_xsi=Xmlns\:xsi -Seam.xsi_schemaLocation=Xsi\:schemaLocation -Seam.namespaceMapping=NamespaceMapping -Seam.encoding=Encoding -Seam.startup=Startup -Seam.expression=Expression -Seam.execute=Execute -Seam.class=Class -Seam.scope=Scope -Seam.precedence=Precedence -Seam.installed=Installed -Seam.auto-create=Auto-Create -Seam.jndi-name=Jndi-Name -Seam.startupDepends=StartupDepends -Seam.type=Type -Seam.value=Value -Seam.method=Method -Seam.import=Import -Seam.key=Key -Seam.group-actor-ids=Group-Actor-Ids -Seam.persistence-unit-name=Persistence-Unit-Name -Seam.filter_name=Filter Name -Seam.enabled=Enabled -Seam.consequence-exception-handler=Consequence-Exception-Handler -Seam.mode=Mode -Seam.debug=Debug -Seam.jndi-pattern=Jndi-Pattern -Seam.client-side-conversations=Client-Side-Conversations -Seam.my-faces-lifecycle-bug=My-Faces-Lifecycle-Bug -Seam.user-transaction-name=User-Transaction-Name -Seam.transaction-management-enabled=Transaction-Management-Enabled -Seam.locale-string=Locale-String -Seam.cookie-enabled=Cookie-Enabled -Seam.entity-manager-factory=Entity-Manager-Factory -Seam.persistence-unit-jndi-name=Persistence-Unit-Jndi-Name -Seam.conversation-timeout=Conversation-Timeout -Seam.concurrent-request-timeout=Concurrent-Request-Timeout -Seam.conversation-id-parameter=Conversation-ID-Parameter -Seam.parent-conversation-id-parameter=Parent-Conversation-ID-Parameter -Seam.conversation-is-long-running-parameter=Conversation-is-Long-Running-Parameter -Seam.uri-encoding=URI-Encoding -Seam.default-flush-mode=Default-Flush-Mode -Seam.no-conversation-view-id=No-Conversation-View-ID -Seam.login-view-id=Login-View-ID -Seam.http-port=Http-Port -Seam.https-port=Https-Port -Seam.cfg-resource-name=Cfg-Resource-Name -Seam.bundle-names=Bundle-Names -Seam.time-zone-id=Time-Zone-ID -Seam.rule-base=Rule-Base -Seam.configuration-file=Configuration-File -Seam.config-name=Config-Name -Seam.new-instance=New-Instance -Seam.files=Files -Seam.url=URL -Seam.local-cache-dir=Local-Cache-Dir -Seam.poll=Poll -Seam.dsl-file=Dsl-File -Seam.rule-files=Rule-Files -Seam.entity-class=Entity-Class -Seam.id=ID -Seam.created-message=Created-Message -Seam.updated-message=Updated-Message -Seam.deleted-message=Deleted-Message -Seam.entity-manager=Entity-Manager -Seam.ejbql=Ejbql -Seam.order=Order -Seam.max-results=Max-Results -Seam.group-by=Group-by -Seam.session=Session -Seam.cacheable=Cacheable -Seam.cache-region=Cache-Region -Seam.fetch-size=Fetch-Size -Seam.cookie-max-age=Cookie-Max-Age -Seam.default-locale=Default-Locale -Seam.supported-locales=Supported-Locales -Seam.factory-jndi-name=Factory-Jndi-Name -Seam.queue-jndi-name=Queue-Jndi-Name -Seam.topic-jndi-name=Topic-Jndi-Name -Seam.username=Username -Seam.password=Password -Seam.administrator=Administrator -Seam.host=Host -Seam.port=Port -Seam.ssl=Ssl -Seam.session-jndi-name=Session-Jndi-Name -Seam.error-page=Error-Page -Seam.use-extensions=Use-Extensions -Seam.key-store=Key-Store -Seam.key-store-password=Key-Store-Password -Seam.key-password=Key-Password -Seam.key-alias=Key-Alias -Seam.naming-strategy=Naming-Strategy -Seam.session-factory=Session-Factory -Seam.session-factory-jndi-name=Session-Factory-Jndi-Name -Seam.poll-interval=Poll-Interval -Seam.poll-timeout=Poll-Timeout -Seam.authenticate-method=Authenticate-Method -Seam.remember-me=Remember-me -Seam.jaas-config-name=Jaas-Config-Name -Seam.security-rules=Security-Rules -Seam.authenticate-every-request=Authenticate-Every-Request -Seam.identity-store=Identity-Store -Seam.role-identity-store=Role-Identity-Store -Seam.user-class=User-Class -Seam.role-class=Role-Class -Seam.token-class=Token-Class -Seam.features=Features -Seam.user-permission-class=User-Permission-Class -Seam.role-permission-class=Role-Permission-Class -Seam.server-address=Server-Address -Seam.server-port=Server-Port -Seam.bind-DN=Bind-DN -Seam.bind-credentials=Bind-Credentials -Seam.user-DN-prefix=User-DN-Prefix -Seam.user-DN-suffix=User-DN-Suffix -Seam.role-DN-prefix=Role-DN-Prefix -Seam.role-DN-suffix=Role-DN-Suffix -Seam.user-context-DN=User-Context-DN -Seam.role-context-DN=Role-Context-DN -Seam.user-role-attribute=User-Role-Attribute -Seam.user-name-attribute=User-Name-Attribute -Seam.role-name-attribute=Role-Name-Attribute -Seam.role-attribute-is-DN=Role-Attribute-is-DN -Seam.user-object-classes=User-Object-Classes -Seam.role-object-classes=Role-Object-Classes -Seam.enabled-attribute=Enabled-Attribute -Seam.search-scope=Search-Scope -Seam.first-name-attribute=First-Name-Attribute -Seam.last-name-attribute=Last-Name-Attribute -Seam.user-password-attribute=User-Password-Attribute -Seam.permission-store=Permission-Store -Seam.config-locations=Config-Locations -Seam.task-executor=Task-Executor -Seam.schedule-dispatcher=Schedule-Dispatcher -Seam.platform-transaction-manager=Platform-Transaction-Manager -Seam.conversation-context-required=Conversation-Context-Required -Seam.join-transaction=Join-Transaction -Seam.theme=Theme -Seam.available-themes=Available-Themes -Seam.entity-loader=Entity-Loader -Seam.enable-cache=Enable-Cache -Seam.force-parser=Force-Parser -Seam.log4j-init-file=Log4j-Init-File -Seam.realm=Realm -Seam.nonce-validity-seconds=Nonce-Validity-Seconds -Seam.auth-type=Auth-Type -Seam.override-client=Override-Client -Seam.url-pattern=URL-Pattern -Seam.disabled=Disabled -Seam.regex-url-pattern=Regex-URL-Pattern -Seam.create-temp-files=Create-Temp-Files -Seam.max-request-size=Max-Request-Size -Seam.invalidate-on-scheme-change=Invalidate-on-Scheme-Change -Seam.application-class=Application-Class -Seam.application-factory-class=Application-Factory-Class -Seam.detect-portlet-context=Detect-Portlet-Context +CDI.name=Name +CDI.value=Value +CDI.class=Class +CDI.stereotype=Stereotype +CDI.pattern=Pattern \ No newline at end of file Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/help/keys-cdi.properties =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/help/keys-cdi.properties 2010-09-14 15:06:48 UTC (rev 24916) +++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/help/keys-cdi.properties 2010-09-14 15:27:36 UTC (rev 24917) @@ -1 +1,29 @@ -FileCDIBeans.editorTitle=Beans XML 1.0 Editor \ No newline at end of file +FileCDIBeans.editorTitle=Beans XML 1.0 Editor + +FileCDIBeans_Properties.Title=File CDI beans.xml + +CDIWeldScan_Properties.Title=Weld Scan + +CDIWeldScan_AddItem_0.WindowTitle=Add Include/Exclude +CDIWeldScan_AddItem_0.Title=Weld Include/Exclude + +CDIWeldClass_Properties.Title=Weld If Class Available + +CDIWeldExclude_Properties.Title=Weld Exclude + +CDIWeldExclude_AddClass.WindowTitle=Add If Class Available +CDIWeldExclude_AddClass.Title=Weld If Class Available + +CDIWeldExclude_AddProperty.WindowTitle=Add If System Property +CDIWeldExclude_AddProperty.Title=Weld If System Property + +CDIWeldInclude_Properties.Title=Weld Include + +CDIWeldInclude_AddClass.WindowTitle=Add If Class Available +CDIWeldInclude_AddClass.Title=Weld If Class Available + +CDIWeldInclude_AddProperty.WindowTitle=Add If System Property +CDIWeldInclude_AddProperty.Title=Weld If System Property + +CDIWeldProperty_Properties.Title=Weld If System Property + Added: 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 (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/meta/cdi-weld.meta 2010-09-14 15:27:36 UTC (rev 24917) @@ -0,0 +1,446 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE XModelEntityGroup PUBLIC "-//Red Hat, Inc.//DTD Meta 1.0//EN" + "meta.dtd"> +<XModelEntityGroup> + <VERSION DEPENDS="Model:1.0" MODULE="CDI" VERSION="1.0"/> + <MAPPINGS> + <MAPPING name="CDINamespaces"> + <PAIR name="weld" value="http://jboss.org/schema/weld/beans"/> + </MAPPING> + <MAPPING name="CDISchemas"> + <PAIR name="weld" value="http://jboss.org/schema/weld/beans_1_1.xsd"/> + </MAPPING> + </MAPPINGS> + <ICONS> + <GROUP name="action"> + <GROUP name="new"> + <GROUP name="cdi"/> + </GROUP> + </GROUP> + <GROUP name="main"> + <GROUP name="cdi"> + <GROUP name="weld"> + <ICON name="exclude" path="plugin:org.jboss.tools.cdi.xml:images/exclude.gif"/> + <ICON name="include" path="plugin:org.jboss.tools.cdi.xml:images/include.gif"/> + <ICON name="scan" path="images/struts/plug_in.gif"/> + </GROUP> + </GROUP> + </GROUP> + </ICONS> + <GlobalActions kind="list"/> + <XModelEntity ImplementingClass="%Custom%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.cdi.xml.ui.editor.form.CDIXMLFormLayoutData" + XMLSUBPATH="weld:if-class-available" name="CDIWeldClass"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.cdi.weld.scan" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="if-class-available" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;category=general;save=always" + name="name" xmlname="name"/> + <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> + <XDependencies/> + </XModelEntity> + <XModelEntity + ImplementingClass="org.jboss.tools.cdi.xml.beans.model.WeldIncludeObjectImpl" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.cdi.xml.ui.editor.form.CDIXMLFormLayoutData;children=%Ordered%" + XMLSUBPATH="weld:exclude" name="CDIWeldExclude"> + <XChildrenEntities> + <XChildEntity name="CDIWeldClass"/> + <XChildEntity name="CDIWeldProperty"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.cdi.weld.exclude" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <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 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> + <XDependencies/> + </XModelEntity> + <XModelEntity + ImplementingClass="org.jboss.tools.cdi.xml.beans.model.WeldIncludeObjectImpl" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.cdi.xml.ui.editor.form.CDIXMLFormLayoutData;children=%Ordered%" + XMLSUBPATH="weld:include" name="CDIWeldInclude"> + <XChildrenEntities> + <XChildEntity name="CDIWeldClass"/> + <XChildEntity name="CDIWeldProperty"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.cdi.weld.include" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <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 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> + <XDependencies/> + </XModelEntity> + <XModelEntity name="CDIWeldIncludeWizard"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.cdi.weld.include" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute PROPERTIES="horizontal=true;label=false" + default="include" name="kind"> + <Constraint loader="List"> + <value name="include"/> + <value name="exclude"/> + </Constraint> + <Editor name="RadioArray"/> + </XModelAttribute> + <XModelAttribute name="name/pattern"/> + <XModelAttribute PROPERTIES="id=true;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> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%Custom%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.cdi.xml.ui.editor.form.CDIXMLFormLayoutData" + XMLSUBPATH="weld:if-system-property" name="CDIWeldProperty"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.cdi.weld.scan" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="if-system-property" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;category=general;save=always" + name="name" xmlname="name"/> + <XModelAttribute PROPERTIES="category=general" name="value" xmlname="value"/> + <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> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%Custom%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.cdi.xml.ui.editor.form.CDIXMLFormLayoutData;children=%Ordered%" + XMLSUBPATH="weld:scan" name="CDIWeldScan"> + <XChildrenEntities> + <XChildEntity name="CDIWeldInclude"/> + <XChildEntity name="CDIWeldExclude"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.cdi.weld.scan" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="scan" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;category=general" default="Scan" + name="name" visibility="false"> + <Editor name="Uneditable"/> + </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="%SpecialWizard%" ICON="action.empty" + PROPERTIES="validator.add=true;support=org.jboss.tools.cdi.xml.beans.model.handlers.AddIncludeSupport;entity=CDIWeldInclude" + displayName="Add Include/Exclude" kind="action" name="AddItem"> + <EntityData EntityName="CDIWeldIncludeWizard"> + <AttributeData AttributeName="kind" Mandatory="no"/> + <AttributeData AttributeName="name/pattern"/> + <AttributeData AttributeName="is regular expression" Mandatory="no"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"> + <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/> + </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> + <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> + <XDependencies/> + </XModelEntity> + <XEntityExtension name="FileCDIBeans"> + <XChildrenEntities> + <XChildEntity maxCount="1" name="CDIWeldScan"/> + </XChildrenEntities> + <XActionItem kind="list"> + <XActionItem ICON="action.empty" displayName="New" group="1" + kind="list" name="CreateActions"> + <XActionItem ICON="action.empty" displayName="Weld" group="1" + kind="list" name="Weld"> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" displayName="Scan..." + kind="action" name="AddScan"> + <EntityData EntityName="CDIWeldScan"/> + </XActionItem> + </XActionItem> + </XActionItem> + </XActionItem> + </XEntityExtension> + <XEntityExtension name="FileCDIBeans_EditorActionList"> + <XChildrenEntities/> + <XActionItem kind="list"> + <XActionItem ICON="action.empty" displayName="New" group="1" + kind="list" name="CreateActions"> + <XActionItem ICON="action.empty" displayName="Weld" group="1" + kind="list" name="Weld"> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" displayName="Scan..." + kind="action" name="AddScan"> + <EntityData EntityName="CDIWeldScan"/> + </XActionItem> + </XActionItem> + </XActionItem> + </XActionItem> + </XEntityExtension> +</XModelEntityGroup> Added: trunk/cdi/plugins/org.jboss.tools.cdi.xml/schemas/beans_1_1.xsd =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.xml/schemas/beans_1_1.xsd (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/schemas/beans_1_1.xsd 2010-09-14 15:27:36 UTC (rev 24917) @@ -0,0 +1,170 @@ +<?xml version="1.0" encoding="UTF-8"?> + +  + +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" + elementFormDefault="qualified" + targetNamespace="http://jboss.org/schema/weld/beans" + xmlns:javaee="http://java.sun.com/xml/ns/javaee" + xmlns:weld="http://jboss.org/schema/weld/beans" + version="1.1"> + + <xs:annotation> + <xs:documentation> + Weld defines a number of extensions to beans.xml, in the namespace + http://jboss.org/schema/weld/beans + </xs:documentation> + </xs:annotation> + + <xs:element name="scan"> + <xs:annotation> + <xs:documentation> + <scan> provides fine control over the classes loaded by + Weld for scanning by nesting a number of include and exclude + filters. Exclusions cause the class to not be loaded, not have + any container lifecycle events fired for them, and not be deployed + as beans. + + In general, the semantics defined by Ant's pattern + sets (http://ant.apache.org/manual/dirtasks.html#patternset) + are followed. If no include filters are defined, all classes are + included. If both include filters and excludes filters are provided, + only class names which match at least one include filter and don't + match any exclude filter are scanned. + </xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="weld:include" /> + <xs:element ref="weld:exclude" /> + </xs:choice> + </xs:complexType> + </xs:element> + + <xs:element name="include" type="weld:filter"> + <xs:annotation> + <xs:documentation> + An include filter causes a class to be scanned. If no include filters + are specified, then all classes are scanned. If both include filters + and excludes filters are specified, only class names which match at + least one include filter and don't match any exclude filter are + scanned. + + A filter may specify match against either the name of a class (or + package) or a regular expression to match. + + A filter is active by default, or may specify activation conditions. If + activation conditions are specified, then the filter is active only if + all activation conditions are met. If all conditions are met, then + classes matching either the name or pattern will be filtered. + </xs:documentation> + </xs:annotation> + </xs:element> + + <xs:element name="exclude" type="weld:filter"> + <xs:annotation> + <xs:documentation> + An exclude filter causes a class to not be scanned. If no exclude + filters are specified, then all classes are scanned. If both include + filters and excludes filters are specified, only class names which + match at least one include filter and don't match any exclude filter + are scanned. + + A filter may specify match against either the name of a class (or + package) or a regular expression to match. + + A filter is active by default, or may specify activation conditions. If + activation conditions are specified, then the filter is active only if + all activation conditions are met. If all conditions are met, then + classes matching either the name or pattern will be filtered. + </xs:documentation> + </xs:annotation> + </xs:element> + + <xs:attributeGroup name="filter-attributes" id="filter-attributes"> + <xs:attribute name="name" type="xs:string"> + <xs:annotation> + <xs:documentation> + The filter applies to classes whose fully qualified name matches this + pattern. Ant-style patterns (see + http://ant.apache.org/manual/dirtasks.html#patterns) are used, such that + '*' matches zero or more characters (in the current package) and '?' + matches one character in the current package. Additionally, '**' matches + this package, and all sub packages. + + For example: + com.redhat.J???? will match any class in the com.redhat package, + whose name starts with the letter 'J' and is five characters long. + com.redhat.R* will match any class in the com.redhat package, whose name + starts with the letter 'R'. + com.redhat.* will match any class in the com.redhat package, but not + subpackages. + com.redhat.** will match any class in the com.redhat package, and all + subpackages. + + If you wish to use a Java regular expression, then pattern should be used. + Only one of name or pattern should be specified + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="pattern" type="xs:string"> + <xs:annotation> + <xs:documentation> + The filter applies to classes whose fully qualified name matches this + regular expression. + + If you wish to use a simple, Ant-style pattern, then name should be used. + Only one of name or pattern should be specified + </xs:documentation> + </xs:annotation> + </xs:attribute> + </xs:attributeGroup> + + <xs:complexType name="filter" id="filter"> + <xs:choice maxOccurs="unbounded" minOccurs="0"> + <xs:element name="if-class-available"> + <xs:annotation> + <xs:documentation> + Activate the filter only activated if a class with the specified name + is available on the application's classpath. If the name starts with + a !, then the filter is active if the class is not available + </xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:attribute name="name" type="xs:string" use="required"/> + </xs:complexType> + </xs:element> + <xs:element name="if-system-property"> + <xs:annotation> + <xs:documentation> + Activate the filter only if the specified system property is set. + If no value is specified, then it will match the system property + on property name alone. If the property name starts with a !, then + the filter is active if the property is not set. If the property value + starts with a !, then the filter is active if the property values do + not match. + </xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:attribute name="name" type="xs:string" use="required"/> + <xs:attribute name="value" type="xs:string" /> + </xs:complexType> + </xs:element> + </xs:choice> + <xs:attributeGroup ref="weld:filter-attributes" /> + </xs:complexType> + +</xs:schema> \ No newline at end of file Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.xml/schemas/beans_1_1.xsd ___________________________________________________________________ Name: svn:mime-type + text/plain Added: 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 (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/WeldIncludeObjectImpl.java 2010-09-14 15:27:36 UTC (rev 24917) @@ -0,0 +1,22 @@ +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); + } +} Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/WeldIncludeObjectImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: 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 (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/handlers/AddIncludeSupport.java 2010-09-14 15:27:36 UTC (rev 24917) @@ -0,0 +1,54 @@ +package org.jboss.tools.cdi.xml.beans.model.handlers; + +import java.util.Properties; + +import org.jboss.tools.common.meta.XChild; +import org.jboss.tools.common.meta.action.impl.SpecialWizardSupport; +import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler; +import org.jboss.tools.common.model.XModelException; +import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.util.FindObjectHelper; +import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; + +public class AddIncludeSupport extends SpecialWizardSupport { + + @Override + public void action(String name) throws XModelException { + if(FINISH.equals(name)) { + execute(); + setFinished(true); + } else if(CANCEL.equals(name)) { + setFinished(true); + } else if(HELP.equals(name)) { + help(); + } + } + + protected void execute() throws XModelException { + Properties p0 = extractStepData(0); + boolean include = "include".equals(p0.getProperty("kind")); + String entity = getObjectEntity(include); + + XModelObject object = XModelObjectLoaderUtil.createValidObject(getTarget().getModel(), entity, null); + + 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); + } + + String getObjectEntity(boolean include) { + XChild[] cs = getTarget().getModelEntity().getChildren(); + String search = include ? "Include" : "Exclude"; + for (XChild c: cs) { + String name = c.getName(); + if(name.indexOf(search) >= 0) { + return name; + } + } + return null; + } + +} Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/handlers/AddIncludeSupport.java ___________________________________________________________________ Name: svn:mime-type + text/plain

15 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r24916 - in trunk/usage: plugins/org.jboss.tools.usage/src/org/jboss/tools/usage and 10 other directories.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2010-09-14 11:06:48 -0400 (Tue, 14 Sep 2010) New Revision: 24916 Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpGetRequest.java 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/IHttpGetRequest.java trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsTestsFocusPoint.java Removed: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/HttpGetRequest.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/HttpResourceMap.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/IHttpGetRequest.java trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsFocusPoint.java Modified: trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/FocusPoint.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/ITracker.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/IURLBuildingStrategy.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/Tracker.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsCookie.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/GoogleAnalyticsEclipseMessages.java 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/reporting/UsageReport.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReportPreferences.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/BrowserUtil.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/PreferencesUtils.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/collectionfilter/CompositeCollectionFilter.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/collectionfilter/ICollectionEntryConverter.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/collectionfilter/ICollectionFilter.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/collectionfilter/NoopConverter.java trunk/usage/tests/org.jboss.tools.usage.test/UsageTestSuite.launch trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsComponentsTest.java trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageIntegrationTest.java trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageTestActivator.java trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/SystemOutLogger.java trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UrlRevealingTracker.java 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/fakes/BundleGroupProviderFake.java trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/EclipsePreferencesFake.java trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/EclipseUserAgentFake.java Log: [JBIDE-7063] base url for tests corrected, corrected missing copyright headers, author tags in all artifacts, refactored http related classes to be in a http-package Modified: trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF 2010-09-14 15:06:48 UTC (rev 24916) @@ -7,6 +7,7 @@ Export-Package: org.jboss.tools.usage, org.jboss.tools.usage.googleanalytics, org.jboss.tools.usage.googleanalytics.eclipse, + org.jboss.tools.usage.http, org.jboss.tools.usage.internal;x-friends:="org.jboss.tools.usage.test", org.jboss.tools.usage.preferences;x-friends:="org.jboss.tools.usage.test", org.jboss.tools.usage.reporting;x-friends:="org.jboss.tools.usage.test", Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/FocusPoint.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/FocusPoint.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/FocusPoint.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -15,6 +15,11 @@ /** * Focus point of the application. It can represent data points like application * load, application module load, user actions, error events etc. + * + * @author Andre Dietisheim + * @see based on <a + * href="http://jgoogleAnalytics.googlecode.com">http://jgoogleAnalytics + * .googlecode.com</a> */ public class FocusPoint { Deleted: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/HttpGetRequest.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/HttpGetRequest.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/HttpGetRequest.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -1,100 +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; - -import java.io.IOException; -import java.net.HttpURLConnection; -import java.net.URL; -import java.text.MessageFormat; - - -/** - * Class that executes a HTTP Get request to the given url. - * - * @author Andre Dietisheim - */ -public class HttpGetRequest implements IHttpGetRequest { - - private static final String USER_AGENT = "User-Agent"; //$NON-NLS-1$ - - private static final String GET_METHOD_NAME = "GET"; //$NON-NLS-1$ - - private ILoggingAdapter loggingAdapter = null; - -// private CookieHandler cookieHandler; - - private String userAgent; - - public HttpGetRequest(String userAgent, ILoggingAdapter loggingAdapter) { - this.userAgent = userAgent; - this.loggingAdapter = loggingAdapter; -// this.cookieHandler = new CookieHandler(); -// this.cookieHandler = CookieHandler.getDefault(); -// cookieHandler.setCookiePolicy(CookiePolicy.ACCEPT_ALL); - } - - /* (non-Javadoc) - * @see org.jboss.tools.usage.IHttpGetRequest#request(java.lang.String) - */ - public void request(String urlString) { - -// CookieHandler currentCookieHandler = setCookieHandler(cookieHandler); - try { - HttpURLConnection urlConnection = createURLConnection(urlString, userAgent); - urlConnection.connect(); - int responseCode = getResponseCode(urlConnection); - if (responseCode == HttpURLConnection.HTTP_OK) { - loggingAdapter.logMessage(MessageFormat.format(UsageMessages.HttpGetMethod_Success, urlString, responseCode)); - } else { - loggingAdapter.logError(MessageFormat.format(UsageMessages.HttpGetMethod_Error_Http, urlString)); - } - } catch (Exception e) { - loggingAdapter.logMessage(MessageFormat.format(UsageMessages.HttpGetMethod_Error_Io, urlString, e.toString())); - } finally { -// setCookieHandler(currentCookieHandler); - } - } - - /** - * 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(); - } - -// private CookieHandler setCookieHandler(CookieHandler cookieHandler) { -// CookieHandler currentCookieHandler = CookieHandler.getDefault(); -// CookieHandler.setDefault(cookieHandler); -// return currentCookieHandler; -// } - - /** - * Creates a new url connection. - * - * @param urlString the url string - * @param userAgent the user agent - * @return the http url connection - * @throws IOException Signals that an I/O exception has occurred. - */ - protected HttpURLConnection createURLConnection(String urlString, String userAgent) throws IOException { - URL url = new URL(urlString); - HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection(); - urlConnection.setInstanceFollowRedirects(true); - urlConnection.setRequestMethod(GET_METHOD_NAME); - urlConnection.setRequestProperty(USER_AGENT, userAgent); - return urlConnection; - } -} Deleted: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/HttpResourceMap.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/HttpResourceMap.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/HttpResourceMap.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -1,150 +0,0 @@ -package org.jboss.tools.usage; - -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.StatusUtils; -import org.jboss.tools.usage.util.reader.ReaderUtils; - -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.getDebugStatus( - plugin.getBundle().getSymbolicName() - , UsageMessages.KillSwitchPreference_Info_HttpQuery - , url); - plugin.getLog().log(status); - responseReader = getInputStreamReader(urlConnection.getInputStream(), urlConnection.getContentType()); - } else { - IStatus status = StatusUtils.getErrorStatus( - plugin.getBundle().getSymbolicName() - , UsageMessages.KillSwitchPreference_Error_Http, null, url); - plugin.getLog().log(status); - } - return responseReader; - } catch (IOException e) { - IStatus status = StatusUtils.getErrorStatus( - plugin.getBundle().getSymbolicName() - , UsageMessages.KillSwitchPreference_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/IHttpGetRequest.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/IHttpGetRequest.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/IHttpGetRequest.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -1,22 +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; - -/** - * A interface that represents a HTTP Get Request. - * - * @author Andre Dietisheim - */ -public interface IHttpGetRequest { - - public abstract void request(String urlString); - -} \ No newline at end of file Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/ITracker.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/ITracker.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/ITracker.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -1,3 +1,13 @@ +/******************************************************************************* + * 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; import java.io.UnsupportedEncodingException; @@ -2,3 +12,2 @@ - /** Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/IURLBuildingStrategy.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/IURLBuildingStrategy.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/IURLBuildingStrategy.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -12,7 +12,6 @@ import java.io.UnsupportedEncodingException; - /** * Interface for the URL building strategy * Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/Tracker.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/Tracker.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/Tracker.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -13,6 +13,8 @@ import java.io.UnsupportedEncodingException; import java.text.MessageFormat; +import org.jboss.tools.usage.http.IHttpGetRequest; + /** * Reports (tracks) usage * Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsCookie.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsCookie.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsCookie.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -11,6 +11,9 @@ package org.jboss.tools.usage.googleanalytics; +/** + * @author Andre Dietisheim + */ public class GoogleAnalyticsCookie { private CharSequence value; Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/GoogleAnalyticsEclipseMessages.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/GoogleAnalyticsEclipseMessages.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/GoogleAnalyticsEclipseMessages.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -12,6 +12,9 @@ import org.eclipse.osgi.util.NLS; +/** + * @author Andre Dietisheim + */ public class GoogleAnalyticsEclipseMessages extends NLS { private static final String BUNDLE_NAME = "org.jboss.tools.usage.googleanalytics.messages"; //$NON-NLS-1$ Copied: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpGetRequest.java (from rev 24574, trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/HttpGetRequest.java) =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpGetRequest.java (rev 0) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpGetRequest.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -0,0 +1,102 @@ +/******************************************************************************* + * 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.IOException; +import java.net.HttpURLConnection; +import java.net.URL; +import java.text.MessageFormat; + +import org.jboss.tools.usage.ILoggingAdapter; +import org.jboss.tools.usage.UsageMessages; + +/** + * Class that executes a HTTP Get request to the given url. + * + * @author Andre Dietisheim + */ +public class HttpGetRequest implements IHttpGetRequest { + + private static final String USER_AGENT = "User-Agent"; //$NON-NLS-1$ + + private static final String GET_METHOD_NAME = "GET"; //$NON-NLS-1$ + + private ILoggingAdapter loggingAdapter = null; + +// private CookieHandler cookieHandler; + + private String userAgent; + + public HttpGetRequest(String userAgent, ILoggingAdapter loggingAdapter) { + this.userAgent = userAgent; + this.loggingAdapter = loggingAdapter; +// this.cookieHandler = new CookieHandler(); +// this.cookieHandler = CookieHandler.getDefault(); +// cookieHandler.setCookiePolicy(CookiePolicy.ACCEPT_ALL); + } + + /* (non-Javadoc) + * @see org.jboss.tools.usage.IHttpGetRequest#request(java.lang.String) + */ + public void request(String urlString) { + +// CookieHandler currentCookieHandler = setCookieHandler(cookieHandler); + try { + HttpURLConnection urlConnection = createURLConnection(urlString, userAgent); + urlConnection.connect(); + int responseCode = getResponseCode(urlConnection); + if (responseCode == HttpURLConnection.HTTP_OK) { + loggingAdapter.logMessage(MessageFormat.format(UsageMessages.HttpGetMethod_Success, urlString, responseCode)); + } else { + loggingAdapter.logError(MessageFormat.format(UsageMessages.HttpGetMethod_Error_Http, urlString)); + } + } catch (Exception e) { + loggingAdapter.logMessage(MessageFormat.format(UsageMessages.HttpGetMethod_Error_Io, urlString, e.toString())); + } finally { +// setCookieHandler(currentCookieHandler); + } + } + + /** + * 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(); + } + +// private CookieHandler setCookieHandler(CookieHandler cookieHandler) { +// CookieHandler currentCookieHandler = CookieHandler.getDefault(); +// CookieHandler.setDefault(cookieHandler); +// return currentCookieHandler; +// } + + /** + * Creates a new url connection. + * + * @param urlString the url string + * @param userAgent the user agent + * @return the http url connection + * @throws IOException Signals that an I/O exception has occurred. + */ + protected HttpURLConnection createURLConnection(String urlString, String userAgent) throws IOException { + URL url = new URL(urlString); + HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection(); + urlConnection.setInstanceFollowRedirects(true); + urlConnection.setRequestMethod(GET_METHOD_NAME); + urlConnection.setRequestProperty(USER_AGENT, userAgent); + return urlConnection; + } +} Copied: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpResourceMap.java (from rev 24574, trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/HttpResourceMap.java) =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpResourceMap.java (rev 0) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/HttpResourceMap.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -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.UsageMessages; +import org.jboss.tools.usage.util.HttpEncodingUtils; +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.getDebugStatus( + plugin.getBundle().getSymbolicName() + , UsageMessages.KillSwitchPreference_Info_HttpQuery + , url); + plugin.getLog().log(status); + responseReader = getInputStreamReader(urlConnection.getInputStream(), urlConnection.getContentType()); + } else { + IStatus status = StatusUtils.getErrorStatus( + plugin.getBundle().getSymbolicName() + , UsageMessages.KillSwitchPreference_Error_Http, null, url); + plugin.getLog().log(status); + } + return responseReader; + } catch (IOException e) { + IStatus status = StatusUtils.getErrorStatus( + plugin.getBundle().getSymbolicName() + , UsageMessages.KillSwitchPreference_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/HttpResourceMap.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/IHttpGetRequest.java (from rev 24574, trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/IHttpGetRequest.java) =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/IHttpGetRequest.java (rev 0) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/IHttpGetRequest.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -0,0 +1,22 @@ +/******************************************************************************* + * 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; + +/** + * A interface that represents a HTTP Get Request. + * + * @author Andre Dietisheim + */ +public interface IHttpGetRequest { + + public abstract void request(String urlString); + +} \ No newline at end of file Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/http/IHttpGetRequest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: 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-14 14:56:34 UTC (rev 24915) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/GlobalUsageReportingSettings.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -13,12 +13,14 @@ import java.util.Map; import org.eclipse.core.runtime.Plugin; -import org.jboss.tools.usage.HttpResourceMap; +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 { 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-14 14:56:34 UTC (rev 24915) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -20,8 +20,6 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.progress.UIJob; import org.jboss.tools.usage.FocusPoint; -import org.jboss.tools.usage.HttpGetRequest; -import org.jboss.tools.usage.IHttpGetRequest; import org.jboss.tools.usage.ILoggingAdapter; import org.jboss.tools.usage.ITracker; import org.jboss.tools.usage.IURLBuildingStrategy; @@ -29,6 +27,8 @@ import org.jboss.tools.usage.Tracker; import org.jboss.tools.usage.googleanalytics.GoogleAnalyticsUrlStrategy; import org.jboss.tools.usage.googleanalytics.IGoogleAnalyticsParameters; +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.util.PreferencesUtils; Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReportPreferences.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReportPreferences.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReportPreferences.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -18,6 +18,9 @@ import org.jboss.tools.usage.util.StatusUtils; import org.osgi.service.prefs.BackingStoreException; +/** + * @author Andre Dietisheim + */ public class UsageReportPreferences { public static void setEnabled(boolean enabled) { Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/BrowserUtil.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/BrowserUtil.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/BrowserUtil.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -19,6 +19,9 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.browser.IWebBrowser; +/** + * @author Andre Dietisheim + */ public class BrowserUtil { /** Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/PreferencesUtils.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/PreferencesUtils.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/PreferencesUtils.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -19,6 +19,9 @@ import org.jboss.tools.usage.internal.JBossToolsUsageActivator; import org.osgi.service.prefs.BackingStoreException; +/** + * @author Andre Dietisheim + */ public class PreferencesUtils { private PreferencesUtils() { Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/collectionfilter/CompositeCollectionFilter.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/collectionfilter/CompositeCollectionFilter.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/collectionfilter/CompositeCollectionFilter.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -11,6 +11,9 @@ package org.jboss.tools.usage.util.collectionfilter; +/** + * @author Andre Dietisheim + */ public class CompositeCollectionFilter<E> implements ICollectionFilter<E> { private ICollectionFilter<E> filters[]; Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/collectionfilter/ICollectionEntryConverter.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/collectionfilter/ICollectionEntryConverter.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/collectionfilter/ICollectionEntryConverter.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -10,6 +10,9 @@ ******************************************************************************/ package org.jboss.tools.usage.util.collectionfilter; +/** + * @author Andre Dietisheim + */ public interface ICollectionEntryConverter<E, T> { public T convert(E entry); } \ No newline at end of file Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/collectionfilter/ICollectionFilter.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/collectionfilter/ICollectionFilter.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/collectionfilter/ICollectionFilter.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -9,6 +9,7 @@ * Red Hat, Inc. - initial API and implementation ******************************************************************************/ package org.jboss.tools.usage.util.collectionfilter; + /** * @authro Andre Dietisheim */ Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/collectionfilter/NoopConverter.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/collectionfilter/NoopConverter.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/collectionfilter/NoopConverter.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -10,7 +10,9 @@ ******************************************************************************/ package org.jboss.tools.usage.util.collectionfilter; - +/** + * @author Andre Dietisheim + */ public class NoopConverter<E, T> implements ICollectionEntryConverter<E, T> { @SuppressWarnings("unchecked") Modified: trunk/usage/tests/org.jboss.tools.usage.test/UsageTestSuite.launch =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/UsageTestSuite.launch 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/tests/org.jboss.tools.usage.test/UsageTestSuite.launch 2010-09-14 15:06:48 UTC (rev 24916) @@ -12,7 +12,7 @@ <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.gwt.core,org.jboss.tools.gwt.ui,org.jboss.tools.common.model,org.jboss.tools.common"/> +<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.gwt.ui,org.jboss.tools.gwt.core"/> <booleanAttribute key="includeOptional" value="true"/> <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> @@ -31,14 +31,14 @@ <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.launching.macosx.MacOSXType/JVM 1.5.0 (MacOS X Default)"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.tools.usage.test.UsageTestSuite"/> -<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.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/> <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.equinox.app@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.runtime.compatibility.registry@default:false,org.hamcrest.core@default:default,org.eclipse.jface@default:default,org.eclipse.ui@default:default,org.eclipse.core.databinding@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.core.commands@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.equinox.common@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.osgi,javax.servlet@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding.observable@default:default,org.junit4@default:default,org.eclipse.ui.workbench@! default:default,org.eclipse.osgi.services@default:default,org.eclipse.swt@default:default,com.ibm.icu@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.help@default:default,org.eclipse.swt.cocoa.macosx.x86_64@default:false"/> -<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.xulrunner.initializer@default:false,org.jboss.tools.usage.test@default:default,org.jboss.tools.usage@default:default"/> +<stringAttribute key="selected_target_plugins" value="org.eclipse.osgi.services@default:default,org.eclipse.core.commands@default:default,javax.servlet@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.registry@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.core.jobs@default:default,org.eclipse.core.databinding.observable@default:default,org.junit4@default:default,org.eclipse.ui.workbench@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.jface@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.swt.cocoa.macosx.x86_64@default:false,org.eclipse.equinox.common@2:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.app@default:default,org.eclipse.jface.databinding@default:default,org.hamcrest.core@default:default,org.eclipse.ui@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.! runtime.compatibility.auth@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt@default:default,org.eclipse.core.databinding@default:default,com.ibm.icu@default:default,org.eclipse.help@default:default,org.eclipse.core.databinding.property@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage@default:default,org.jboss.tools.usage.test@default:default,org.jboss.tools.xulrunner.initializer@default:false"/> <booleanAttribute key="show_selected_only" value="false"/> <booleanAttribute key="tracing" value="false"/> <booleanAttribute key="useCustomFeatures" value="false"/> Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsComponentsTest.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsComponentsTest.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsComponentsTest.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -1,3 +1,13 @@ +/******************************************************************************* + * 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; Deleted: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsFocusPoint.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsFocusPoint.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsFocusPoint.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -1,26 +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 org.jboss.tools.usage.FocusPoint; - -/** - * @author Andre Dietisheim - */ -public class JBossToolsFocusPoint extends FocusPoint { - - public JBossToolsFocusPoint(String childFocusPoint) { - super("tools"); - setChild(new FocusPoint("usage") - .setChild(new FocusPoint(childFocusPoint))); - } - -} Copied: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsTestsFocusPoint.java (from rev 24848, trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsFocusPoint.java) =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsTestsFocusPoint.java (rev 0) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsTestsFocusPoint.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -0,0 +1,27 @@ +/******************************************************************************* + * 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 org.jboss.tools.usage.FocusPoint; + +/** + * @author Andre Dietisheim + */ +public class JBossToolsTestsFocusPoint extends FocusPoint { + + public JBossToolsTestsFocusPoint(String childFocusPoint) { + super("tools"); + setChild(new FocusPoint("usage") + .setChild(new FocusPoint("tests") + .setChild(new FocusPoint(childFocusPoint)))); + } + +} Property changes on: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsTestsFocusPoint.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageIntegrationTest.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageIntegrationTest.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageIntegrationTest.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -17,13 +17,13 @@ import java.util.regex.Pattern; import org.jboss.tools.usage.FocusPoint; -import org.jboss.tools.usage.HttpGetRequest; -import org.jboss.tools.usage.IHttpGetRequest; import org.jboss.tools.usage.ILoggingAdapter; import org.jboss.tools.usage.IURLBuildingStrategy; import org.jboss.tools.usage.PluginLogger; import org.jboss.tools.usage.googleanalytics.GoogleAnalyticsUrlStrategy; import org.jboss.tools.usage.googleanalytics.IGoogleAnalyticsParameters; +import org.jboss.tools.usage.http.HttpGetRequest; +import org.jboss.tools.usage.http.IHttpGetRequest; import org.jboss.tools.usage.test.fakes.ReportingEclipseEnvironmentFake; import org.jboss.tools.usage.test.fakes.RepportingEclipseEnvironmentFakeSingleton; import org.junit.Test; @@ -97,8 +97,6 @@ } private FocusPoint createFocusPoint(String childFocusPoint) { - return new FocusPoint("tools") - .setChild(new FocusPoint("usage") - .setChild(new FocusPoint(childFocusPoint))); + return new JBossToolsTestsFocusPoint(childFocusPoint); } } Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -14,8 +14,8 @@ import java.io.IOException; import java.net.HttpURLConnection; -import org.jboss.tools.usage.HttpGetRequest; import org.jboss.tools.usage.ILoggingAdapter; +import org.jboss.tools.usage.http.HttpGetRequest; import org.junit.Test; /** @@ -971,7 +971,7 @@ + "&utmfl=1.6.0_20" + "&utmr=0" + "&utm_content=1.0.0.qualifier" - + "&utmp=testJBossToolsVersionInAdContent" + + "&utmp=" + new JBossToolsTestsFocusPoint("testJBossToolsVersionInAdContent") + "&utmac=UA-17645367-1" + "&utmcc=__utma%3D999.43297294488397354581284108794036.1284108794025.1284108794025.1284108794025.1%3B%2B__utmz%3D999.1284108794025.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B" + "&gaq=1"; @@ -1013,7 +1013,7 @@ + "&utmdt=testWinWin7UserAgent" + "&utmfl=1.6.0_20" + "&utmr=1.0.0.qualifier" - + "&utmp=testWinWin7UserAgent" + + "&utmp=" + new JBossToolsTestsFocusPoint("testWinWin7UserAgent") + "&utmac=UA-17645367-1" + "&utmcc=__utma%3D999.43297885388356354581284108794036.1284108794025.1284108794025.1284108794025.1%3B%2B__utmz%3D999.1284108794025.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B" + "&gaq=1"; @@ -1034,7 +1034,7 @@ + "&utmdt=testWinVistaUserAgent" + "&utmfl=1.6.0_20" + "&utmr=1.0.0.qualifier" - + "&utmp=testWinVistaUserAgent" + + "&utmp=" + new JBossToolsTestsFocusPoint("testWinVistaUserAgent") + "&utmac=UA-17645367-1" + "&utmcc=__utma%3D999.43297885388397354581284108794036.1284108794025.1284108794025.1284108794025.1%3B%2B__utmz%3D999.1284108794025.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B" + "&gaq=1"; @@ -1055,7 +1055,7 @@ + "&utmdt=testWinXPUserAgent" + "&utmfl=1.6.0_20" + "&utmr=1.0.0.qualifier" - + "&utmp=testWinXPUserAgent" + + "&utmp=" + new JBossToolsTestsFocusPoint("testWinXPUserAgent") + "&utmac=UA-17645367-1" + "&utmcc=__utma%3D999.43297245388397354581284108794036.1284108794025.1284108794025.1284108794025.1%3B%2B__utmz%3D999.1284108794025.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B" + "&gaq=1"; @@ -1076,7 +1076,7 @@ + "&utmdt=testWin2000UserAgent" + "&utmfl=1.6.0_20" + "&utmr=1.0.0.qualifier" - + "&utmp=testWin2000UserAgent" + + "&utmp=" + new JBossToolsTestsFocusPoint("testWin2000UserAgent") + "&utmac=UA-17645367-1" + "&utmcc=__utma%3D999.43297292388397354581284108794036.1284108794025.1284108794025.1284108794025.1%3B%2B__utmz%3D999.1284108794025.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B" + "&gaq=1"; @@ -1097,7 +1097,7 @@ + "&utmdt=testMacLeopardUserAgent" + "&utmfl=1.6.0_20" + "&utmr=1.0.0.qualifier" - + "&utmp=testMacLeopardUserAgent" + + "&utmp=" + new JBossToolsTestsFocusPoint("testMacLeopardUserAgent") + "&utmac=UA-17645367-1" + "&utmcc=__utma%3D999.43297292388397333581284108794036.1284108794025.1284108794025.1284108794025.1%3B%2B__utmz%3D999.1284108794025.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B" + "&gaq=1"; @@ -1118,7 +1118,7 @@ + "&utmdt=testMacSnowLeopardUserAgent" + "&utmfl=1.6.0_20" + "&utmr=1.0.0.qualifier" - + "&utmp=testMacSnowLeopardUserAgent" + + "&utmp=" + new JBossToolsTestsFocusPoint("testMacSnowLeopardUserAgent") + "&utmac=UA-17645367-1" + "&utmcc=__utma%3D999.43297292388397333581222108794036.1284108794025.1284108794025.1284108794025.1%3B%2B__utmz%3D999.1284108794025.1.1.%EF%BF%BFutmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%7Cutmctr%3DVPE-%EF%BF%BF%3B" + "&gaq=1"; Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageTestActivator.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageTestActivator.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageTestActivator.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -1,3 +1,12 @@ +/******************************************************************************* + * 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 org.eclipse.core.runtime.Plugin; Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/SystemOutLogger.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/SystemOutLogger.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/SystemOutLogger.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -1,3 +1,13 @@ +/******************************************************************************* + * 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 org.jboss.tools.usage.ILoggingAdapter; Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UrlRevealingTracker.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UrlRevealingTracker.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UrlRevealingTracker.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -15,10 +15,10 @@ import java.util.concurrent.locks.ReentrantLock; import org.jboss.tools.usage.FocusPoint; -import org.jboss.tools.usage.IHttpGetRequest; import org.jboss.tools.usage.ILoggingAdapter; import org.jboss.tools.usage.IURLBuildingStrategy; import org.jboss.tools.usage.Tracker; +import org.jboss.tools.usage.http.IHttpGetRequest; /** * @author Andre Dietisheim 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-14 14:56:34 UTC (rev 24915) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageTestSuite.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -15,11 +15,8 @@ /** * @author Andre Dietisheim - * */ @RunWith(Suite.class) -/** - */ @Suite.SuiteClasses({ FocusPointTest.class, GoogleAnalyticsUrlStrategyTest.class, Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/BundleGroupProviderFake.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/BundleGroupProviderFake.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/BundleGroupProviderFake.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -14,16 +14,9 @@ import org.eclipse.core.runtime.IBundleGroupProvider; import org.osgi.framework.Bundle; -/******************************************************************************* - * 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 - ******************************************************************************/ +/** + * @author Andre Dietisheim + */ public class BundleGroupProviderFake implements IBundleGroupProvider { private String[] featureNames; Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/EclipsePreferencesFake.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/EclipsePreferencesFake.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/EclipsePreferencesFake.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -18,6 +18,9 @@ import org.osgi.service.prefs.BackingStoreException; import org.osgi.service.prefs.Preferences; +/** + * @author Andre Dietisheim + */ public class EclipsePreferencesFake implements IEclipsePreferences { private Map<String, String> preferences; Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/EclipseUserAgentFake.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/EclipseUserAgentFake.java 2010-09-14 14:56:34 UTC (rev 24915) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/EclipseUserAgentFake.java 2010-09-14 15:06:48 UTC (rev 24916) @@ -1,3 +1,12 @@ +/******************************************************************************* + * 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.fakes; import org.eclipse.core.runtime.Assert; @@ -4,6 +13,9 @@ import org.eclipse.core.runtime.Platform; import org.jboss.tools.usage.googleanalytics.eclipse.EclipseUserAgent; +/** + * @author Andre Dietisheim + */ public class EclipseUserAgentFake extends EclipseUserAgent { private static final String APPLICATION_NAME = "com.jboss.jbds.product";

15 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r24915 - in trunk/vpe: tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dmaliarevich Date: 2010-09-14 10:56:34 -0400 (Tue, 14 Sep 2010) New Revision: 24915 Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/selectionbar/ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/selectionbar/SelectionBarTest.java Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/selbar/SelectionBar.java Log: https://jira.jboss.org/browse/JBIDE-6981 , drop down lists were added, swt bot test was added. Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/selbar/SelectionBar.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/selbar/SelectionBar.java 2010-09-14 14:38:38 UTC (rev 24914) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/selbar/SelectionBar.java 2010-09-14 14:56:34 UTC (rev 24915) @@ -11,6 +11,8 @@ package org.jboss.tools.vpe.selbar; import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; import java.util.List; import org.eclipse.compare.Splitter; @@ -19,6 +21,7 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.events.DisposeListener; +import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.graphics.Color; @@ -53,13 +56,13 @@ import org.jboss.tools.common.model.ui.util.ModelUtilities; import org.jboss.tools.jst.jsp.JspEditorPlugin; import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage; -import org.jboss.tools.jst.jsp.preferences.VpePreference; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.selection.VpeSourceSelection; import org.jboss.tools.vpe.editor.selection.VpeSourceSelectionBuilder; import org.jboss.tools.vpe.editor.util.SelectionUtil; import org.jboss.tools.vpe.messages.VpeUIMessages; import org.w3c.dom.Node; +import org.w3c.dom.NodeList; /** * This class create and manage the Selection Bar under the VPE. @@ -69,7 +72,7 @@ * @author erick * @author yradtsevich */ -public class SelectionBar implements SelectionListener { +public class SelectionBar{ /** * */ @@ -330,7 +333,7 @@ } } } - + /** * Cleans {@link #selBar} and adds to it buttons which * appropriate the {@code node} and all its ancestors. @@ -347,31 +350,85 @@ // for now dropDownMenu = null int elementCounter = 0; - while (node != null - && (node.getNodeType() == Node.ELEMENT_NODE - || node.getNodeType() == Node.COMMENT_NODE)) { + while ((node != null) + && ((node.getNodeType() == Node.ELEMENT_NODE) + || (node.getNodeType() == Node.COMMENT_NODE))) { addNodeListenerTo(node); - + + /* + * If there is no DDM -- item will be added to line + */ if (dropDownMenu == null) { - ToolItem item = new ToolItem(selBar, SWT.FLAT | SWT.CHECK, 1); - item.addSelectionListener(this); + ToolItem item; + NodeList children = node.getChildNodes(); + List<Node> list = new ArrayList<Node>(); + for (int i = 0; i < children.getLength(); i++) { + if (children.item(i).getNodeType() == Node.ELEMENT_NODE) { + list.add(children.item(i)); + } + } + /* + * for the last tag -- show check button + */ + if ((elementCounter == 0) && (list.size() == 0)){ + item = new ToolItem(selBar, SWT.FLAT | SWT.CHECK, 1); + item.addSelectionListener(new SelectionListener() { + public void widgetSelected(SelectionEvent e) { + handleSelectionEvent(e); + } + public void widgetDefaultSelected(SelectionEvent e) { + handleSelectionEvent(e); + } + }); + } else { + /* + * Create DropDownMenu button + */ + item = new ToolItem(selBar, SWT.DROP_DOWN, 1); + DropdownSelectionListener listenerOne = new DropdownSelectionListener(item); + for (Node node2 : list) { + listenerOne.add(node2); + } + item.addSelectionListener(listenerOne); + } item.setData(node); item.setText(node.getNodeName()); - + /* + * When the item does not fit to the bar -- + * put it to the DDM + */ if (!isItemShown(selBar.getItem(elementCounter + 1))) { item.dispose(); dropDownMenu = new Menu(selBar); } } + /* + * After the DDM has been created + * all other items will be added to the DDM + * as they do not fit to the selection bar any more. + */ if (dropDownMenu != null) { MenuItem menuItem = new MenuItem(dropDownMenu, SWT.CHECK, 0); - menuItem.addSelectionListener(this); + menuItem.addSelectionListener(new SelectionListener() { + public void widgetSelected(SelectionEvent e) { + handleSelectionEvent(e); + } + public void widgetDefaultSelected(SelectionEvent e) { + handleSelectionEvent(e); + } + }); menuItem.setText(node.getNodeName()); menuItem.setData(node); } + /* + * Count the elements + */ elementCounter++; + /* + * Get the parent to put it to the bar + */ node = node.getParentNode(); } itemCount = elementCounter; @@ -522,7 +579,7 @@ } } - public void widgetSelected(SelectionEvent e) { + public void handleSelectionEvent(SelectionEvent e) { Widget widget = e.widget; /* ensure that the ToolItem or MenuItem is selected @@ -548,6 +605,77 @@ st.append(" Bar : " + selBar.getBounds().width); //$NON-NLS-1$ return st.toString(); } + + /** + ********************************************************************************************* + * This class provides the "drop down" functionality for the selection bar. + *********************************************************************************************/ + class DropdownSelectionListener extends SelectionAdapter { + private ToolItem dropdown; + private Menu menu; + private boolean shown = false; + /** + * Constructs a DropdownSelectionListener + * + * @param dropdown + * the dropdown this listener belongs to + */ + public DropdownSelectionListener(ToolItem dropdown) { + this.dropdown = dropdown; + menu = new Menu(dropdown.getParent().getShell()); + } + + /** + * Adds an item to the dropdown list + * + * @param item + * the item to add + */ + public void add(Node node) { + MenuItem menuItem = new MenuItem(menu, SWT.NONE); + menuItem.setText(node.getNodeName()); + menuItem.setData(node); + menuItem.addSelectionListener(new SelectionAdapter() { + public void widgetSelected(SelectionEvent event) { + handleSelectionEvent(event); + } + }); + } + + /** + * Called when either the button itself or the dropdown arrow is clicked + * + * @param event + * the event that trigged this call + */ + public void widgetSelected(SelectionEvent event) { + /* + * If they clicked the arrow, we show the list or close it + */ + if (event.detail == SWT.ARROW) { + if (shown) { + menu.setVisible(false); + shown = false; + } else { + /* + * Determine where to put the dropdown list and show it + */ + ToolItem item = (ToolItem) event.widget; + Rectangle rect = item.getBounds(); + Point pt = item.getParent().toDisplay( + new Point(rect.x, rect.y)); + menu.setLocation(pt.x, pt.y + rect.height); + menu.setVisible(true); + shown = true; + } + } else { + /* + * User pushed the button; take appropriate action + */ + handleSelectionEvent(event); + } + } + } } /** @@ -670,4 +798,5 @@ public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) { selectionBar.updateNodes(false); } -} + } + Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/selectionbar/SelectionBarTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/selectionbar/SelectionBarTest.java (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/selectionbar/SelectionBarTest.java 2010-09-14 14:56:34 UTC (rev 24915) @@ -0,0 +1,72 @@ +/******************************************************************************* + * Copyright (c) 2007-2010 Exadel, Inc. and 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: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.vpe.ui.bot.test.editor.selectionbar; + +import java.awt.event.KeyEvent; + +import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor; +import org.jboss.tools.ui.bot.ext.SWTTestExt; +import org.jboss.tools.ui.bot.ext.helper.KeyboardHelper; +import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase; + +/** + * The Class SelectionBarTest. + */ +public class SelectionBarTest extends VPEAutoTestCase { + + private final String SELECTED_TEXT = "<h:inputText value=\"#{user.name}\" required=\"true\"> <f:validateLength maximum=\"30\" minimum=\"3\"/> </h:inputText>"; //$NON-NLS-1$ + private final String SELECTED_TEXT2 = "<f:validateLength maximum=\"30\" minimum=\"3\"/>"; //$NON-NLS-1$ + + public SelectionBarTest() { + super(); + } + + @Override + protected void closeUnuseDialogs() { + /* + * Nothing to close + */ + } + + @Override + protected boolean isUnuseDialogOpened() { + return false; + } + + public void testSelectionBarTagsList() throws Throwable { + SWTBotEditor editor = SWTTestExt.packageExplorer.openFile(JBT_TEST_PROJECT_NAME, + "WebContent", "pages", TEST_PAGE); //$NON-NLS-1$ //$NON-NLS-2$ + editor.setFocus(); + /* + * Navigate to '<h:inputText value="#{user.name}" required="true">' + */ + editor.toTextEditor().navigateTo(18, 10); + /* + * Send key press event to fire VPE listeners + */ + KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_LEFT); + /* + * Click on the tag in the selection bar + */ + bot.toolbarDropDownButton("h:inputText").click(); //$NON-NLS-1$ + + String line = editor.toTextEditor().getSelection(); + line = line.replaceAll("\n", ""); //$NON-NLS-1$ //$NON-NLS-2$ + line = line.replaceAll("\r", ""); //$NON-NLS-1$ //$NON-NLS-2$ + line = line.replaceAll("\t", ""); //$NON-NLS-1$ //$NON-NLS-2$ + assertEquals("<h:inputText> should be selected", SELECTED_TEXT, line); //$NON-NLS-1$ + + bot.toolbarDropDownButton("h:inputText").menuItem("f:validateLength").click(); //$NON-NLS-1$ //$NON-NLS-2$ + line = editor.toTextEditor().getSelection(); + assertEquals("<f:validateLength> should be selected", SELECTED_TEXT2, line); //$NON-NLS-1$ + } + +}

15 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r24914 - in trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui: forms and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2010-09-14 10:38:38 -0400 (Tue, 14 Sep 2010) New Revision: 24914 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/XAttributeSupport.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/Form.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/FormAttributeData.java Log: https://jira.jboss.org/browse/JBIDE-6998 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/XAttributeSupport.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/XAttributeSupport.java 2010-09-14 14:36:08 UTC (rev 24913) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/XAttributeSupport.java 2010-09-14 14:38:38 UTC (rev 24914) @@ -129,10 +129,12 @@ XAttribute attr = ads[i].getAttribute(); IModelPropertyEditorAdapter adapter = (useObject) ? createAdapter(xmo, attr) : createAdapter(xmo, ads[i]); PropertyEditor editor = (useObject) ? createEditor(adapter, xmo, attr) : createEditor(adapter, xmo, ads[i]); - String labelText = WizardKeys.getAttributeDisplayName(ads[i]); - if (labelText!=null) { - labelText = labelText + ((ads[i].getMandatoryFlag()) ? "*" : ""); //$NON-NLS-1$ //$NON-NLS-2$ - editor.setLabelText(labelText); + if(editor.getLabelText() == null) { + String labelText = WizardKeys.getAttributeDisplayName(ads[i]); + if (labelText!=null) { + labelText = labelText + ((ads[i].getMandatoryFlag()) ? "*" : ""); //$NON-NLS-1$ //$NON-NLS-2$ + editor.setLabelText(labelText); + } } adapters.add(adapter); Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/Form.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/Form.java 2010-09-14 14:36:08 UTC (rev 24913) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/Form.java 2010-09-14 14:38:38 UTC (rev 24914) @@ -217,10 +217,12 @@ for(int i=0; i<attributes.length; i++) { shownProperties[i] = attributes[i].getName(); String label = null; - if(childEntity != null && childEntity.getAttribute(attributes[i].getName()) != null) { + if(attributes[i].getDisplayName() != null && attributes[i].getDisplayName().length() > 0) { + label = attributes[i].getDisplayName(); + } else if(childEntity != null && childEntity.getAttribute(attributes[i].getName()) != null) { label = WizardKeys.getAttributeDisplayName(childEntity.getAttribute(attributes[i].getName()), true); } - columnLabels[i] = label != null ? label : attributes[i].getDisplayName(); + columnLabels[i] = label != null ? label : ""; widths[i] = attributes[i].getWidth(); } Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/FormAttributeData.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/FormAttributeData.java 2010-09-14 14:36:08 UTC (rev 24913) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/FormAttributeData.java 2010-09-14 14:38:38 UTC (rev 24914) @@ -108,7 +108,7 @@ * For use only as table column name */ public String getDisplayName() { - return (displayName == null) ? WizardKeys.toDisplayName(name) : displayName; + return displayName; } public ILayoutDataFactory getLayoutDataFactory() {

15 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r24913 - in trunk/usage: plugins/org.jboss.tools.usage/.settings and 7 other directories.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2010-09-14 10:36:08 -0400 (Tue, 14 Sep 2010) New Revision: 24913 Added: trunk/usage/plugins/org.jboss.tools.usage/OSGI-INF/ trunk/usage/plugins/org.jboss.tools.usage/OSGI-INF/l10n/ trunk/usage/plugins/org.jboss.tools.usage/OSGI-INF/l10n/bundle.properties trunk/usage/plugins/org.jboss.tools.usage/config.ini trunk/usage/tests/org.jboss.tools.usage.test/OSGI-INF/ trunk/usage/tests/org.jboss.tools.usage.test/OSGI-INF/l10n/ trunk/usage/tests/org.jboss.tools.usage.test/OSGI-INF/l10n/bundle.properties Removed: trunk/usage/plugins/org.jboss.tools.usage/plugin.properties Modified: trunk/usage/plugins/org.jboss.tools.usage/.classpath trunk/usage/plugins/org.jboss.tools.usage/.settings/org.eclipse.jdt.core.prefs trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF trunk/usage/plugins/org.jboss.tools.usage/build.properties trunk/usage/plugins/org.jboss.tools.usage/plugin.xml trunk/usage/tests/org.jboss.tools.usage.test/META-INF/MANIFEST.MF trunk/usage/tests/org.jboss.tools.usage.test/build.properties Log: [JBIDE-7020] implentation & tests internationalized Modified: trunk/usage/plugins/org.jboss.tools.usage/.classpath =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/.classpath 2010-09-14 14:35:41 UTC (rev 24912) +++ trunk/usage/plugins/org.jboss.tools.usage/.classpath 2010-09-14 14:36:08 UTC (rev 24913) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: trunk/usage/plugins/org.jboss.tools.usage/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/.settings/org.eclipse.jdt.core.prefs 2010-09-14 14:35:41 UTC (rev 24912) +++ trunk/usage/plugins/org.jboss.tools.usage/.settings/org.eclipse.jdt.core.prefs 2010-09-14 14:36:08 UTC (rev 24913) @@ -1,5 +1,11 @@ -#Fri Aug 06 17:57:19 CEST 2010 +#Tue Sep 14 16:15:24 CEST 2010 eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.5 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_enum_constant=16 Modified: trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF 2010-09-14 14:35:41 UTC (rev 24912) +++ trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF 2010-09-14 14:36:08 UTC (rev 24913) @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: %BundleName +Bundle-Name: %bundle-name Bundle-SymbolicName: org.jboss.tools.usage;singleton:=true Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 @@ -10,10 +10,12 @@ org.jboss.tools.usage.internal;x-friends:="org.jboss.tools.usage.test", org.jboss.tools.usage.preferences;x-friends:="org.jboss.tools.usage.test", org.jboss.tools.usage.reporting;x-friends:="org.jboss.tools.usage.test", - org.jboss.tools.usage.util -Require-Bundle: org.eclipse.osgi;bundle-version="3.5.0", + org.jboss.tools.usage.util, + org.jboss.tools.usage.util.collectionfilter, + org.jboss.tools.usage.util.reader +Require-Bundle: org.eclipse.osgi;bundle-version="[3.5.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", - org.eclipse.ui;bundle-version="3.5.0" + org.eclipse.ui;bundle-version="[3.5.0,4.0.0)" Bundle-Activator: org.jboss.tools.usage.internal.JBossToolsUsageActivator -Bundle-Vendor: %BundleVendor +Bundle-Vendor: %bundle-vendor Bundle-ActivationPolicy: lazy Added: trunk/usage/plugins/org.jboss.tools.usage/OSGI-INF/l10n/bundle.properties =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/OSGI-INF/l10n/bundle.properties (rev 0) +++ trunk/usage/plugins/org.jboss.tools.usage/OSGI-INF/l10n/bundle.properties 2010-09-14 14:36:08 UTC (rev 24913) @@ -0,0 +1,4 @@ +#Properties file for org.jboss.tools.usage +page.name = Usage Reporting Preferences +bundle-name = JBoss Tools Usage Reporting +bundle-vendor = JBoss by Red Hat \ No newline at end of file Property changes on: trunk/usage/plugins/org.jboss.tools.usage/OSGI-INF/l10n/bundle.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/usage/plugins/org.jboss.tools.usage/build.properties =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/build.properties 2010-09-14 14:35:41 UTC (rev 24912) +++ trunk/usage/plugins/org.jboss.tools.usage/build.properties 2010-09-14 14:36:08 UTC (rev 24913) @@ -1,10 +1,18 @@ source.. = src/ output.. = bin/ -bin.includes = META-INF/,\ - .,\ +bin.includes = .,\ + plugin.properties.bak,\ + OSGI-INF/l10n/bundle.properties,\ + .classpath,\ + .project,\ + .settings/,\ + META-INF/,\ + JBoss Usage Reporter.launch,\ + about.html,\ + build.properties,\ plugin.xml,\ - about.html,\ - bin/ + pom.xml,\ + src/ src.includes = .classpath,\ .project,\ .settings/,\ @@ -13,4 +21,8 @@ about.html,\ build.properties,\ plugin.xml,\ - src/ + src/,\ + plugin.properties.bak,\ + pom.xml,\ + plugin.properties,\ + OSGI-INF/ Added: trunk/usage/plugins/org.jboss.tools.usage/config.ini =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/config.ini (rev 0) +++ trunk/usage/plugins/org.jboss.tools.usage/config.ini 2010-09-14 14:36:08 UTC (rev 24913) @@ -0,0 +1,20 @@ +org.jboss.tools.usage/ask_user_for_usage_report_preference=false +org.jboss.tools.usage.configuration.ask_user_for_usage_report_preference=false +configuration/org.jboss.tools.usage.ask_user_for_usage_report_preference=false +eclipse.ask_user_for_usage_report_preference=false +org.eclipse.pde.core.ask_user_for_usage_report_preference=false +org.eclipse.core.runtime.ask_user_for_usage_report_preference=false +ask_user_for_usage_report_preference=false + +org.eclipse.update.reconcile=false +eclipse.p2.profile=SDKProfile +osgi.instance.area.default=(a)user.home/Documents/workspace +osgi.framework=file\:/Applications/jbdevstudio/eclipse/plugins/org.eclipse.osgi_3.5.2.R35x_v20100126.jar +eclipse.buildId=M20100211-1343 +org.eclipse.equinox.simpleconfigurator.configUrl=file\:/Users/admin/workspaces/jboss-tools-usage/.metadata/.plugins/org.eclipse.pde.core/JBoss Usage Reporter/org.eclipse.equinox.simpleconfigurator/bundles.info +osgi.configuration.cascaded=true +eclipse.product=com.jboss.jbds.product.product +eclipse.application=org.eclipse.ui.ide.workbench +eclipse.p2.data.area=(a)config.dir/.p2 +osgi.bundles.defaultStartLevel=4 +osgi.framework.extensions=reference\:file\:org.eclipse.equinox.transforms.hook_1.0.100.v20100119-2308.jar,reference\:file\:javax.transaction_1.1.1.v201002111330.jar Property changes on: trunk/usage/plugins/org.jboss.tools.usage/config.ini ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: trunk/usage/plugins/org.jboss.tools.usage/plugin.properties =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/plugin.properties 2010-09-14 14:35:41 UTC (rev 24912) +++ trunk/usage/plugins/org.jboss.tools.usage/plugin.properties 2010-09-14 14:36:08 UTC (rev 24913) @@ -1,2 +0,0 @@ -BundleName=JBoss Tools Usage Reporting -BundleVendor=JBoss by Red Hat \ No newline at end of file Modified: trunk/usage/plugins/org.jboss.tools.usage/plugin.xml =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/plugin.xml 2010-09-14 14:35:41 UTC (rev 24912) +++ trunk/usage/plugins/org.jboss.tools.usage/plugin.xml 2010-09-14 14:36:08 UTC (rev 24913) @@ -12,7 +12,7 @@ <page class="org.jboss.tools.usage.preferences.UsageReportPreferencePage" id="org.jboss.tools.usage.analytics.preferences.UsageAnalyticsPreferencePage" - name="Usage Reporting Preferences" + name="%page.name" category="org.jboss.tools.common.model.ui.MainPreferencePage"> </page> </extension> Modified: trunk/usage/tests/org.jboss.tools.usage.test/META-INF/MANIFEST.MF =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/META-INF/MANIFEST.MF 2010-09-14 14:35:41 UTC (rev 24912) +++ trunk/usage/tests/org.jboss.tools.usage.test/META-INF/MANIFEST.MF 2010-09-14 14:36:08 UTC (rev 24913) @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Tests for JBoss Tools Usage Reporting +Bundle-Name: %bundle-name Bundle-SymbolicName: org.jboss.tools.usage.test Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 @@ -9,4 +9,5 @@ org.eclipse.core.runtime;bundle-version="3.5.0", org.junit4;bundle-version="[4.8.1,5.0.0)" Bundle-Activator: org.jboss.tools.usage.test.JBossToolsUsageTestActivator +Bundle-Vendor: %bundle-vendor Bundle-ActivationPolicy: lazy Added: trunk/usage/tests/org.jboss.tools.usage.test/OSGI-INF/l10n/bundle.properties =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/OSGI-INF/l10n/bundle.properties (rev 0) +++ trunk/usage/tests/org.jboss.tools.usage.test/OSGI-INF/l10n/bundle.properties 2010-09-14 14:36:08 UTC (rev 24913) @@ -0,0 +1,3 @@ +#Properties file for org.jboss.tools.usage.test +bundle-name = Tests for JBoss Tools Usage Reporting +bundle-vendor = JBoss by Red Hat Property changes on: trunk/usage/tests/org.jboss.tools.usage.test/OSGI-INF/l10n/bundle.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/usage/tests/org.jboss.tools.usage.test/build.properties =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/build.properties 2010-09-14 14:35:41 UTC (rev 24912) +++ trunk/usage/tests/org.jboss.tools.usage.test/build.properties 2010-09-14 14:36:08 UTC (rev 24913) @@ -3,7 +3,8 @@ bin.includes = META-INF/,\ .,\ about.html,\ - bin/ + bin/,\ + OSGI-INF/l10n/bundle.properties src.includes = .settings/,\ .project,\ .classpath,\ @@ -19,4 +20,7 @@ GlobalUsageReportingSettingsTest.launch,\ JBossToolsUsageIntegrationTest.launch,\ UsageTestSuite.launch,\ - pom.xml + pom.xml,\ + JBossToolsComponentsTest.launch,\ + ReportingEclipseEnvironmentTest.launch,\ + OSGI-INF/

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