JBoss Tools SVN: r24306 - trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-08-19 13:23:45 -0400 (Thu, 19 Aug 2010)
New Revision: 24306
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java
Log:
https://jira.jboss.org/browse/JBIDE-6864 Tycho build of org.mozilla.xulrunner.cocoa.macosx_1.9.1.2 missing native libraries
fix plugin name generation for non mac platforms
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java 2010-08-19 17:23:21 UTC (rev 24305)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java 2010-08-19 17:23:45 UTC (rev 24306)
@@ -79,7 +79,7 @@
buff.append(".").append(Platform.getWS()) //$NON-NLS-1$
.append(".").append(Platform.getOS()); //$NON-NLS-1$
if(! Platform.OS_MACOSX.equals(Platform.getOS())) {
- buff.append(Platform.getOSArch());
+ buff.append(".").append(Platform.getOSArch());
}
XULRUNNER_BUNDLE = buff.toString();
mozilla = Mozilla.getInstance();
15 years, 4 months
JBoss Tools SVN: r24305 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui: META-INF and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jjohnstn
Date: 2010-08-19 13:23:21 -0400 (Thu, 19 Aug 2010)
New Revision: 24305
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/META-INF/MANIFEST.MF
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/InstanceView.java
Log:
2010-08-19 Jeff Johnston <jjohnstn(a)redhat.com>
* META-INF/MANIFEST.MF: Add dependency on rse.
* src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties: Add connecting to RSE
message.
* src/org/jboss/tools/deltacloud/ui/views/InstanceView.java (makeActions): Add connect to
RSE action.
(fillContextMenu): Add connect to RSE action skeleton and enable/disable depending on instance
state.
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-08-19 17:16:12 UTC (rev 24304)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-08-19 17:23:21 UTC (rev 24305)
@@ -1,3 +1,13 @@
+2010-08-19 Jeff Johnston <jjohnstn(a)redhat.com>
+
+ * META-INF/MANIFEST.MF: Add dependency on rse.
+ * src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties: Add connecting to RSE
+ message.
+ * src/org/jboss/tools/deltacloud/ui/views/InstanceView.java (makeActions): Add connect to
+ RSE action.
+ (fillContextMenu): Add connect to RSE action skeleton and enable/disable depending on instance
+ state.
+
2010-08-18 Jeff Johnston <jjohnstn(a)redhat.com>
* src/org/jboss/tools/deltacloud/ui/views/CVInstancesCategoryElement.java (listChanged): Get
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/META-INF/MANIFEST.MF 2010-08-19 17:16:12 UTC (rev 24304)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/META-INF/MANIFEST.MF 2010-08-19 17:23:21 UTC (rev 24305)
@@ -10,6 +10,7 @@
org.eclipse.core.runtime,
org.eclipse.ui.views;bundle-version="3.4.1",
org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.0",
- org.jboss.tools.deltacloud.core;bundle-version="1.0.0"
+ org.jboss.tools.deltacloud.core;bundle-version="1.0.0",
+ org.eclipse.rse.core;bundle-version="3.1.1"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
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-08-19 17:16:12 UTC (rev 24304)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties 2010-08-19 17:23:21 UTC (rev 24305)
@@ -23,6 +23,7 @@
Refresh.label=Refresh View
CreateInstance.label=Launch Instance
DeleteInstance.label=Delete Instance
+ShowInRSE.label=Show in Remote System Explorer
Start.label=Start
Stop.label=Stop
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java 2010-08-19 17:16:12 UTC (rev 24304)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java 2010-08-19 17:23:21 UTC (rev 24305)
@@ -24,6 +24,10 @@
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.rse.core.IRSESystemType;
+import org.eclipse.rse.core.model.IHost;
+import org.eclipse.rse.core.model.ISystemRegistry;
+import org.eclipse.rse.core.model.SystemStartHere;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
@@ -59,6 +63,7 @@
private final static String STOP_LABEL = "Stop.label"; //$NON-NLS-1$
private final static String REBOOT_LABEL = "Reboot.label"; //$NON-NLS-1$
private final static String DESTROY_LABEL = "Destroy.label"; //$NON-NLS-1$
+ private final static String RSE_LABEL = "ShowInRSE.label"; //$NON-NLS-1$
private final static String STARTING_INSTANCE_TITLE = "StartingInstance.title"; //$NON-NLS-1$
private final static String STARTING_INSTANCE_MSG = "StartingInstance.msg"; //$NON-NLS-1$
private final static String STOPPING_INSTANCE_TITLE = "StoppingInstance.title"; //$NON-NLS-1$
@@ -84,6 +89,7 @@
private Action stopAction;
private Action destroyAction;
private Action rebootAction;
+ private Action rseAction;
private Map<String, Action> instanceActions;
private Map<String, Job> currentPerformingActions = new HashMap<String, Job>();
@@ -286,6 +292,13 @@
for (String action : actions) {
instanceActions.get(action).setEnabled(true);
}
+ manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
+ manager.add(rseAction);
+ if (selectedElement.getState().equals(DeltaCloudInstance.RUNNING) ||
+ selectedElement.getState().equals(DeltaCloudInstance.STOPPED))
+ rseAction.setEnabled(true);
+ else
+ rseAction.setEnabled(false);
// Other plug-ins can contribute there actions here
manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
}
@@ -450,6 +463,18 @@
destroyAction.setText(CVMessages.getString(DESTROY_LABEL));
destroyAction.setToolTipText(CVMessages.getString(DESTROY_LABEL));
+ rseAction = new Action() {
+ public void run() {
+ ISelection selection = viewer.getSelection();
+ DeltaCloudInstance instance = (DeltaCloudInstance)((IStructuredSelection)selection).getFirstElement();
+ String hostname = instance.getHostName();
+ ISystemRegistry registry = SystemStartHere.getSystemRegistry();
+ String connectionName = instance.getName() + " [" + instance.getId() + "]"; //$NON-NLS-1$ //$NON-NLS-2$
+ }
+ };
+ rseAction.setText(CVMessages.getString(RSE_LABEL));
+ rseAction.setToolTipText(CVMessages.getString(RSE_LABEL));
+
instanceActions = new HashMap<String, Action>();
instanceActions.put(DeltaCloudInstance.START, startAction);
instanceActions.put(DeltaCloudInstance.STOP, stopAction);
15 years, 4 months
JBoss Tools SVN: r24304 - trunk/drools/tests/org.jboss.tools.drools.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-08-19 13:16:12 -0400 (Thu, 19 Aug 2010)
New Revision: 24304
Modified:
trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/pom.xml
Log:
drools.ui.bot tests are disabled for a while
Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/pom.xml
===================================================================
--- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/pom.xml 2010-08-19 17:04:35 UTC (rev 24303)
+++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/pom.xml 2010-08-19 17:16:12 UTC (rev 24304)
@@ -10,5 +10,5 @@
<groupId>org.jboss.tools.drools.tests</groupId>
<artifactId>org.jboss.tools.drools.ui.bot.test</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <packaging>eclipse-test-plugin</packaging>
+ <packaging>eclipse-plugin</packaging>
</project>
15 years, 4 months
JBoss Tools SVN: r24303 - trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-08-19 13:04:35 -0400 (Thu, 19 Aug 2010)
New Revision: 24303
Modified:
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java
Log:
[JBIDE-6376] replaced timestamp by a variable value again. Looks like constant (but unique) value does not produce hits. Not sure though, so I get back to the version that produced hits, but produced too many of them
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java 2010-08-19 16:36:02 UTC (rev 24302)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java 2010-08-19 17:04:35 UTC (rev 24303)
@@ -143,12 +143,14 @@
private String getCookies(FocusPoint focusPoint) {
StringBuilder builder = new StringBuilder();
+ String timeStamp = String.valueOf(System.currentTimeMillis());
+
new GoogleAnalyticsCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_UNIQUE_VISITOR_ID,
new StringBuilder().append("999.")
.append(googleParameters.getUserId()).append(IGoogleAnalyticsParameters.DOT)
- .append('0').append(IGoogleAnalyticsParameters.DOT)
- .append('0').append(IGoogleAnalyticsParameters.DOT)
- .append('0').append(IGoogleAnalyticsParameters.DOT)
+ .append(timeStamp).append(IGoogleAnalyticsParameters.DOT)
+ .append(timeStamp).append(IGoogleAnalyticsParameters.DOT)
+ .append(timeStamp).append(IGoogleAnalyticsParameters.DOT)
.append(VISITS)
.append(IGoogleAnalyticsParameters.SEMICOLON),
IGoogleAnalyticsParameters.PLUS_SIGN)
@@ -157,7 +159,7 @@
new GoogleAnalyticsCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_REFERRAL_TYPE,
new StringBuilder()
.append("999.")
- .append("-1")
+ .append(timeStamp)
.append(IGoogleAnalyticsParameters.DOT)
.append("1.1."))
.appendTo(builder);
15 years, 4 months
JBoss Tools SVN: r24302 - trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module.
by jbosstools-commits＠lists.jboss.org
Author: bbrodt
Date: 2010-08-19 12:36:02 -0400 (Thu, 19 Aug 2010)
New Revision: 24302
Modified:
trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/JBTBPELPublisher.java
Log:
https://jira.jboss.org/browse/JBIDE-6879
quick fix
Modified: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/JBTBPELPublisher.java
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/JBTBPELPublisher.java 2010-08-19 15:43:17 UTC (rev 24301)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/JBTBPELPublisher.java 2010-08-19 16:36:02 UTC (rev 24302)
@@ -117,7 +117,7 @@
} else {
LocalCopyCallback handler = new LocalCopyCallback(server, deployPath, tempDeployPath);
PublishCopyUtil util = new PublishCopyUtil(handler);
- resultList.addAll(Arrays.asList(util.publishFull(members, monitor)));
+ resultList.addAll(Arrays.asList(util.initFullPublish(members, monitor)));
}
addDeployedPathToDescriptor(server, last.getProject(), deployPath); // persist it
pruneList(resultList);
15 years, 4 months
JBoss Tools SVN: r24301 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5908.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2010-08-19 11:43:17 -0400 (Thu, 19 Aug 2010)
New Revision: 24301
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5908/welcome.xhtml.xml
Log:
https://jira.jboss.org/browse/JBIDE-6530 , after fixing https://jira.jboss.org/browse/JBIDE-6600 <title> has no visual representation.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5908/welcome.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5908/welcome.xhtml.xml 2010-08-19 14:42:34 UTC (rev 24300)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5908/welcome.xhtml.xml 2010-08-19 15:43:17 UTC (rev 24301)
@@ -10,9 +10,6 @@
<DIV VPE:INCLUDE-ELEMENT="yes" STYLE="-moz-user-modify: read-only;">
<DIV STYLE="-moz-user-modify: read-only;">
<DIV STYLE="display: none; -moz-user-modify: read-only;">
- <H1 STYLE="-moz-user-modify: read-only;">
- page
-</H1>
</DIV>
<DIV STYLE="-moz-user-modify: read-only;">
<DIV VPE:INCLUDE-ELEMENT="yes" STYLE="-moz-user-modify: read-only;">
@@ -20,9 +17,6 @@
</SPAN>
<DIV STYLE="-moz-user-modify: read-only;">
<DIV STYLE="display: none; -moz-user-modify: read-only;">
- <H1 STYLE="-moz-user-modify: read-only;">
- #{cc.attrs.pageTitle}
-</H1>
<DIV STYLE="-moz-user-modify: read-only;">
</DIV>
</DIV>
@@ -61,9 +55,6 @@
<DIV STYLE="-moz-user-modify: read-only;">
<DIV
STYLE="display: none; -moz-user-modify: read-only;">
- <H1 STYLE="-moz-user-modify: read-only;">
- panel
-</H1>
</DIV>
<DIV STYLE="-moz-user-modify: read-only;">
<DIV VPE:INCLUDE-ELEMENT="yes"
15 years, 4 months
JBoss Tools SVN: r24300 - trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-08-19 10:42:34 -0400 (Thu, 19 Aug 2010)
New Revision: 24300
Added:
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsCookie.java
Removed:
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/UrlCookie.java
Modified:
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java
Log:
[JBIDE-6376] enforce order of reported plugins
Copied: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsCookie.java (from rev 24298, trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/UrlCookie.java)
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsCookie.java (rev 0)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsCookie.java 2010-08-19 14:42:34 UTC (rev 24300)
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * 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.googleanalytics;
+
+import org.eclipse.core.runtime.Assert;
+
+public class GoogleAnalyticsCookie {
+
+ private CharSequence value;
+ private String identifier;
+ private char delimiter;
+
+ public GoogleAnalyticsCookie(String identifier, CharSequence value, char delimiter) {
+ Assert.isTrue(identifier != null && identifier.length() > 0);
+ Assert.isTrue(value != null && value.length() > 0);
+
+ this.identifier = identifier;
+ this.value = value;
+ this.delimiter = delimiter;
+ }
+
+ public GoogleAnalyticsCookie(String identifier, CharSequence value) {
+ this(identifier, value, (char) -1);
+ }
+
+ public void appendTo(StringBuilder builder) {
+ builder.append(identifier)
+ .append(IGoogleAnalyticsParameters.EQUALS_SIGN)
+ .append(value);
+ if (delimiter != (char) -1) {
+ builder.append(delimiter);
+ }
+ }
+}
Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsCookie.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java 2010-08-19 14:23:05 UTC (rev 24299)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java 2010-08-19 14:42:34 UTC (rev 24300)
@@ -143,7 +143,7 @@
private String getCookies(FocusPoint focusPoint) {
StringBuilder builder = new StringBuilder();
- new UrlCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_UNIQUE_VISITOR_ID,
+ new GoogleAnalyticsCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_UNIQUE_VISITOR_ID,
new StringBuilder().append("999.")
.append(googleParameters.getUserId()).append(IGoogleAnalyticsParameters.DOT)
.append('0').append(IGoogleAnalyticsParameters.DOT)
@@ -154,7 +154,7 @@
IGoogleAnalyticsParameters.PLUS_SIGN)
.appendTo(builder);
- new UrlCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_REFERRAL_TYPE,
+ new GoogleAnalyticsCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_REFERRAL_TYPE,
new StringBuilder()
.append("999.")
.append("-1")
@@ -162,22 +162,22 @@
.append("1.1."))
.appendTo(builder);
- new UrlCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_UTMCSR,
+ new GoogleAnalyticsCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_UTMCSR,
"(direct)",
IGoogleAnalyticsParameters.PIPE)
.appendTo(builder);
- new UrlCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_UTMCCN,
+ new GoogleAnalyticsCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_UTMCCN,
"(direct)",
IGoogleAnalyticsParameters.PIPE)
.appendTo(builder);
- new UrlCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_UTMCMD,
+ new GoogleAnalyticsCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_UTMCMD,
"(none)",
IGoogleAnalyticsParameters.PIPE)
.appendTo(builder);
- new UrlCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_KEYWORD,
+ new GoogleAnalyticsCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_KEYWORD,
googleParameters.getKeyword())
.appendTo(builder);
Deleted: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/UrlCookie.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/UrlCookie.java 2010-08-19 14:23:05 UTC (rev 24299)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/UrlCookie.java 2010-08-19 14:42:34 UTC (rev 24300)
@@ -1,42 +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.googleanalytics;
-
-import org.eclipse.core.runtime.Assert;
-
-public class UrlCookie {
-
- private CharSequence value;
- private String identifier;
- private char delimiter;
-
- public UrlCookie(String identifier, CharSequence value, char delimiter) {
- Assert.isTrue(identifier != null && identifier.length() > 0);
- Assert.isTrue(value != null && value.length() > 0);
-
- this.identifier = identifier;
- this.value = value;
- this.delimiter = delimiter;
- }
-
- public UrlCookie(String identifier, CharSequence value) {
- this(identifier, value, (char) -1);
- }
-
- public void appendTo(StringBuilder builder) {
- builder.append(identifier)
- .append(IGoogleAnalyticsParameters.EQUALS_SIGN)
- .append(value);
- if (delimiter != (char) -1) {
- builder.append(delimiter);
- }
- }
-}
15 years, 4 months
JBoss Tools SVN: r24299 - trunk/vpe/tests/org.jboss.tools.vpe.test/scheme.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2010-08-19 10:23:05 -0400 (Thu, 19 Aug 2010)
New Revision: 24299
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.test/scheme/scheme.xsd
Log:
https://jira.jboss.org/browse/JBIDE-6530
Modified: trunk/vpe/tests/org.jboss.tools.vpe.test/scheme/scheme.xsd
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.test/scheme/scheme.xsd 2010-08-19 13:47:15 UTC (rev 24298)
+++ trunk/vpe/tests/org.jboss.tools.vpe.test/scheme/scheme.xsd 2010-08-19 14:23:05 UTC (rev 24299)
@@ -37,6 +37,7 @@
</xsd:sequence>
<xsd:attribute name="case-sensitive" type="vpe:VPE-BOOLEAN" use="optional"/>
<xsd:attribute name="name" use="required" type="xsd:string"/>
+ <xsd:attribute name="docbook" use="optional" type="vpe:VPE-BOOLEAN"/>
<xsd:attribute name="haveVisualPreview" use="optional" type="vpe:VPE-BOOLEAN"/>
</xsd:complexType>
<!-- -->
@@ -322,12 +323,11 @@
</xsd:complexType>
<!-- -->
<xsd:complexType name="HTML_SPAN" mixed="true">
- <xsd:choice maxOccurs="unbounded">
-
+ <xsd:sequence maxOccurs="unbounded">
<xsd:element name="value" type="vpe:VALUE" minOccurs="0"/>
<xsd:element name="copy" type="vpe:COPY" minOccurs="0"/>
<xsd:element name="input" type="vpe:HTML_INPUT" minOccurs="0" form="unqualified" />
- </xsd:choice>
+ </xsd:sequence>
<xsd:attribute name="style" type="xsd:string" use="optional"/>
<xsd:attribute name="class" type="xsd:string" use="optional"/>
<xsd:attribute name="title" type="xsd:string" use="optional"/>
@@ -346,6 +346,7 @@
<xsd:attribute name="checked" type="xsd:string" use="optional"/>
<xsd:attribute name="border" type="xsd:string" use="optional"/>
<xsd:attribute name="disabled" type="xsd:string" use="optional"/>
+ <xsd:attribute name="id" type="xsd:string" use="optional"/>
</xsd:complexType>
<!-- -->
<xsd:complexType name="HTML_DIV" mixed="true">
@@ -499,6 +500,8 @@
<xsd:attribute name="class" type="xsd:string" use="optional"/>
<xsd:attribute name="for" type="xsd:string" use="optional"/>
<xsd:attribute name="title" type="xsd:string" use="optional"/>
+ <xsd:attribute name="id" type="xsd:string" use="optional"/>
+ <xsd:attribute name="dir" type="xsd:string" use="optional"/>
</xsd:complexType>
<!-- -->
<xsd:complexType name="HTML_BUTTON" mixed="true">
15 years, 4 months
JBoss Tools SVN: r24298 - trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-08-19 09:47:15 -0400 (Thu, 19 Aug 2010)
New Revision: 24298
Added:
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/UrlCookie.java
Log:
[JBIDE-6376] * eclipse instance id now stays constant (changed on each restart before)
Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/UrlCookie.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/UrlCookie.java (rev 0)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/UrlCookie.java 2010-08-19 13:47:15 UTC (rev 24298)
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * 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.googleanalytics;
+
+import org.eclipse.core.runtime.Assert;
+
+public class UrlCookie {
+
+ private CharSequence value;
+ private String identifier;
+ private char delimiter;
+
+ public UrlCookie(String identifier, CharSequence value, char delimiter) {
+ Assert.isTrue(identifier != null && identifier.length() > 0);
+ Assert.isTrue(value != null && value.length() > 0);
+
+ this.identifier = identifier;
+ this.value = value;
+ this.delimiter = delimiter;
+ }
+
+ public UrlCookie(String identifier, CharSequence value) {
+ this(identifier, value, (char) -1);
+ }
+
+ public void appendTo(StringBuilder builder) {
+ builder.append(identifier)
+ .append(IGoogleAnalyticsParameters.EQUALS_SIGN)
+ .append(value);
+ if (delimiter != (char) -1) {
+ builder.append(delimiter);
+ }
+ }
+}
Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/UrlCookie.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 4 months
JBoss Tools SVN: r24297 - in trunk/usage/plugins/org.jboss.tools.usage: src/org/jboss/tools/usage/googleanalytics and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-08-19 09:46:22 -0400 (Thu, 19 Aug 2010)
New Revision: 24297
Modified:
trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsMessages.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/IGoogleAnalyticsParameters.java
Log:
[JBIDE-6376] eclipse instance uniqueness now fixed
Modified: trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF 2010-08-19 12:07:52 UTC (rev 24296)
+++ trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF 2010-08-19 13:46:22 UTC (rev 24297)
@@ -6,7 +6,7 @@
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.jboss.tools.usage,
org.jboss.tools.usage.googleanalytics,
- org.jboss.tools.usage.reporting; x-internal:=true; 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.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsMessages.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsMessages.java 2010-08-19 12:07:52 UTC (rev 24296)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsMessages.java 2010-08-19 13:46:22 UTC (rev 24297)
@@ -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.googleanalytics;
import org.eclipse.osgi.util.NLS;
@@ -3,4 +13,5 @@
public class GoogleAnalyticsMessages extends NLS {
+
private static final String BUNDLE_NAME = "org.jboss.tools.usage.googleanalytics.messages"; //$NON-NLS-1$
static {
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java 2010-08-19 12:07:52 UTC (rev 24296)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java 2010-08-19 13:46:22 UTC (rev 24297)
@@ -22,7 +22,11 @@
* @author Andre Dietisheim
*
* @see <a
- * href="http://code.google.com/apis/analytics/docs/tracking/gaTrackingTroubleshoo...">GIF Request Parameters</a>
+ * href="http://code.google.com/apis/analytics/docs/tracking/gaTrackingTroubleshoo...">GIF
+ * Request Parameters</a>
+ * @see <a
+ * href="http://code.google.com/apis/analytics/docs/concepts/gaConceptsCookies.htm...">Cookies
+ * Set By Google Analytics</a>
*/
public class GoogleAnalyticsUrlStrategy implements IURLBuildingStrategy {
@@ -124,7 +128,8 @@
appendParameter(IGoogleAnalyticsParameters.PARAM_BROWSER_LANGUAGE, googleParameters.getBrowserLanguage(),
builder);
appendParameter(IGoogleAnalyticsParameters.PARAM_PAGE_TITLE, focusPoint.getContentTitle(), builder);
-// appendParameter(IGoogleAnalyticsParameters.PARAM_HID, getRandomNumber(), builder);
+ // appendParameter(IGoogleAnalyticsParameters.PARAM_HID,
+ // getRandomNumber(), builder);
appendParameter(IGoogleAnalyticsParameters.PARAM_REFERRAL, googleParameters.getReferral(), builder);
appendParameter(IGoogleAnalyticsParameters.PARAM_PAGE_REQUEST, focusPoint.getContentURI(), builder);
@@ -136,80 +141,49 @@
}
private String getCookies(FocusPoint focusPoint) {
- long timeStamp = System.currentTimeMillis();
StringBuilder builder = new StringBuilder();
- builder.append(IGoogleAnalyticsParameters.PARAM_COOKIES_FIRST_VISIT)
- .append(IGoogleAnalyticsParameters.EQUALS_SIGN)
- .append("999.")
- .append(googleParameters.getUserId()).append(IGoogleAnalyticsParameters.DOT)
- .append(timeStamp).append(IGoogleAnalyticsParameters.DOT)
- .append(timeStamp).append(IGoogleAnalyticsParameters.DOT)
- .append(timeStamp).append(IGoogleAnalyticsParameters.DOT)
- .append(VISITS)
- .append(IGoogleAnalyticsParameters.SEMICOLON)
- .append(IGoogleAnalyticsParameters.PLUS_SIGN)
- .append(IGoogleAnalyticsParameters.PARAM_COOKIES_REFERRAL_TYPE)
- .append(IGoogleAnalyticsParameters.EQUALS_SIGN)
- .append("999.")
- .append(timeStamp).append(IGoogleAnalyticsParameters.DOT)
- .append("1.1.")
- .append(IGoogleAnalyticsParameters.PARAM_COOKIES_UTMCSR).append(IGoogleAnalyticsParameters.EQUALS_SIGN)
- .append("(direct)").append(IGoogleAnalyticsParameters.PIPE)
- .append(IGoogleAnalyticsParameters.PARAM_COOKIES_UTMCCN).append(IGoogleAnalyticsParameters.EQUALS_SIGN)
- .append("(direct)").append(IGoogleAnalyticsParameters.PIPE)
- .append(IGoogleAnalyticsParameters.PARAM_COOKIES_UTMCMD).append(IGoogleAnalyticsParameters.EQUALS_SIGN)
- .append("(none)");
- appendCookieKeyword(builder);
- builder.append(IGoogleAnalyticsParameters.SEMICOLON);
- return EncodingUtils.checkedEncodeUtf8(builder.toString());
+ new UrlCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_UNIQUE_VISITOR_ID,
+ new StringBuilder().append("999.")
+ .append(googleParameters.getUserId()).append(IGoogleAnalyticsParameters.DOT)
+ .append('0').append(IGoogleAnalyticsParameters.DOT)
+ .append('0').append(IGoogleAnalyticsParameters.DOT)
+ .append('0').append(IGoogleAnalyticsParameters.DOT)
+ .append(VISITS)
+ .append(IGoogleAnalyticsParameters.SEMICOLON),
+ IGoogleAnalyticsParameters.PLUS_SIGN)
+ .appendTo(builder);
- // builder.append(IGoogleAnalyticsParameters.PARAM_COOKIE_VALUES)
- // .append(IGoogleAnalyticsParameters.EQUALS_SIGN)
- // .append("__utma%3D")
- // .append(getRandomNumber())
- // .append(".")
- // .append(getRandomNumber())
- // .append(".")
- // .append(now)
- // .append(".")
- // .append(now)
- // .append(".")
- // .append(now)
- // .append(".2%3B%2B)")
- //
- // // .append("__utmb%3D")
- // // .append(getRandomNumber())
- // // .append("%3B%2B__utmc%3D")
- // // .append(getRandomNumber())
- // // .append("%3B%2B")
- //
- // .append("__utmz%3D")
- // .append(getRandomNumber())
- // .append(".")
- // .append(now)
- // .append(IGoogleAnalyticsParameters.AMPERSAND);
+ new UrlCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_REFERRAL_TYPE,
+ new StringBuilder()
+ .append("999.")
+ .append("-1")
+ .append(IGoogleAnalyticsParameters.DOT)
+ .append("1.1."))
+ .appendTo(builder);
- // .append("utmcsr%3D(direct)%7C")
- // .append("utmccn%3D(direct)%7C")
- // .append("utmcmd%3D(none)%3B");
+ new UrlCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_UTMCSR,
+ "(direct)",
+ IGoogleAnalyticsParameters.PIPE)
+ .appendTo(builder);
- }
+ new UrlCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_UTMCCN,
+ "(direct)",
+ IGoogleAnalyticsParameters.PIPE)
+ .appendTo(builder);
- /**
- * Appends the keyword to the cookies.
- *
- * @param builder
- * the builder to append to
- */
- private void appendCookieKeyword(StringBuilder builder) {
- String keyword = googleParameters.getKeyword();
- if (keyword != null && keyword.length() > 0) {
- builder.append(IGoogleAnalyticsParameters.PIPE)
- .append(IGoogleAnalyticsParameters.PARAM_COOKIES_KEYWORD)
- .append(IGoogleAnalyticsParameters.EQUALS_SIGN)
- .append(keyword);
- }
+ new UrlCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_UTMCMD,
+ "(none)",
+ IGoogleAnalyticsParameters.PIPE)
+ .appendTo(builder);
+
+ new UrlCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_KEYWORD,
+ googleParameters.getKeyword())
+ .appendTo(builder);
+
+ builder.append(IGoogleAnalyticsParameters.SEMICOLON);
+
+ return EncodingUtils.checkedEncodeUtf8(builder.toString());
}
private String getRandomNumber() {
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/IGoogleAnalyticsParameters.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/IGoogleAnalyticsParameters.java 2010-08-19 12:07:52 UTC (rev 24296)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/IGoogleAnalyticsParameters.java 2010-08-19 13:46:22 UTC (rev 24297)
@@ -36,7 +36,7 @@
public static final String PARAM_ACCOUNT_NAME = "utmac";
public static final String PARAM_HOST_NAME = "utmhn";
public static final String PARAM_COOKIES = "utmcc";
- public static final String PARAM_COOKIES_FIRST_VISIT = "__utma";
+ public static final String PARAM_COOKIES_UNIQUE_VISITOR_ID = "__utma";
public static final String PARAM_REFERRAL = "utmr";
public static final String PARAM_TRACKING_CODE_VERSION = "utmwv";
15 years, 4 months