JBoss Tools SVN: r24186 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core: META-INF and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jjohnstn
Date: 2010-08-16 15:59:46 -0400 (Mon, 16 Aug 2010)
New Revision: 24186
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/META-INF/MANIFEST.MF
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java
Log:
2010-08-16 Jeff Johnston <jjohnstn(a)redhat.com>
* META-INF/MANIFEST.MF: Add dependency on org.eclipse.equinox.security.
* src/org/jboss/tools/deltacloud/core/DeltaCloud.java (DeltaCloud): Store
the password for the cloud using Secure Preferences using the cloud's url
and username to form the key.
(getPreferencesKey): New static method to formulate a preferences key used
to store and retrieve a password for a cloud.
* src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java (loadClouds):
New method to get persisted clouds.
(getClouds): Remove test stuff that creates a sample connection to the
mock cloud.
(saveClouds): New method to persist clouds minus passwords.
(DeltaCloudManager): Add call to loadClouds at construction.
(addCloud): Call saveClouds after modifying list.
(removeCloud): Ditto.
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-08-16 18:58:09 UTC (rev 24185)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-08-16 19:59:46 UTC (rev 24186)
@@ -1,3 +1,20 @@
+2010-08-16 Jeff Johnston <jjohnstn(a)redhat.com>
+
+ * META-INF/MANIFEST.MF: Add dependency on org.eclipse.equinox.security.
+ * src/org/jboss/tools/deltacloud/core/DeltaCloud.java (DeltaCloud): Store
+ the password for the cloud using Secure Preferences using the cloud's url
+ and username to form the key.
+ (getPreferencesKey): New static method to formulate a preferences key used
+ to store and retrieve a password for a cloud.
+ * src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java (loadClouds):
+ New method to get persisted clouds.
+ (getClouds): Remove test stuff that creates a sample connection to the
+ mock cloud.
+ (saveClouds): New method to persist clouds minus passwords.
+ (DeltaCloudManager): Add call to loadClouds at construction.
+ (addCloud): Call saveClouds after modifying list.
+ (removeCloud): Ditto.
+
2010-08-13 Jeff Johnston <jjohnstn(a)redhat.com>
* src/org/jboss/tools/deltacloud/core/DeltaCloud.java (DeltaCloud): Take the
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/META-INF/MANIFEST.MF 2010-08-16 18:58:09 UTC (rev 24185)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/META-INF/MANIFEST.MF 2010-08-16 19:59:46 UTC (rev 24186)
@@ -6,7 +6,8 @@
Bundle-Activator: org.jboss.tools.deltacloud.core.Activator
Bundle-Vendor: Red Hat Inc.
Require-Bundle: org.eclipse.core.runtime,
- org.apache.log4j;bundle-version="1.2.13"
+ org.apache.log4j;bundle-version="1.2.13",
+ org.eclipse.equinox.security;bundle-version="1.0.100"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Export-Package: org.jboss.tools.deltacloud.core;x-friends:="org.jboss.tools.deltacloud.ui"
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-08-16 18:58:09 UTC (rev 24185)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-08-16 19:59:46 UTC (rev 24186)
@@ -7,6 +7,10 @@
import java.util.List;
import org.eclipse.core.runtime.ListenerList;
+import org.eclipse.equinox.security.storage.EncodingUtils;
+import org.eclipse.equinox.security.storage.ISecurePreferences;
+import org.eclipse.equinox.security.storage.SecurePreferencesFactory;
+import org.eclipse.equinox.security.storage.StorageException;
import org.jboss.tools.deltacloud.core.client.DeltaCloudAuthException;
import org.jboss.tools.deltacloud.core.client.DeltaCloudClient;
import org.jboss.tools.deltacloud.core.client.DeltaCloudClientException;
@@ -27,12 +31,32 @@
ListenerList imageListeners = new ListenerList();
public DeltaCloud(String name, String url, String username, String passwd) throws MalformedURLException {
+ this(name, url, username, passwd, false);
+ }
+
+ public DeltaCloud(String name, String url, String username, String passwd, boolean persistent) throws MalformedURLException {
this.client = new DeltaCloudClient(new URL(url + "/api"), username, passwd); //$NON-NLS-1$
this.url = url;
this.name = name;
this.username = username;
+ if (persistent) {
+ ISecurePreferences root = SecurePreferencesFactory.getDefault();
+ String key = DeltaCloud.getPreferencesKey(url, username);
+ ISecurePreferences node = root.node(key);
+ try {
+ node.put("password", passwd, true /*encrypt*/);
+ } catch (StorageException e) {
+ e.printStackTrace();
+ }
+ }
}
+ public static String getPreferencesKey(String url, String username) {
+ String key = "/org/jboss/tools/deltacloud/core/"; //$NON-NLS-1$
+ key += url + "/" + username; //$NON-NLS-1$
+ return EncodingUtils.encodeSlashes(key);
+ }
+
public String getName() {
return name;
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java 2010-08-16 18:58:09 UTC (rev 24185)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java 2010-08-16 19:59:46 UTC (rev 24186)
@@ -1,20 +1,106 @@
package org.jboss.tools.deltacloud.core;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
import java.net.MalformedURLException;
-import java.net.URL;
import java.util.ArrayList;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.ListenerList;
+import org.eclipse.equinox.security.storage.ISecurePreferences;
+import org.eclipse.equinox.security.storage.SecurePreferencesFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
public class DeltaCloudManager {
+ public final static String CLOUDFILE_NAME = "clouds.xml"; //$NON-NLS-1$
+
private static DeltaCloudManager cloudManager;
private ArrayList<DeltaCloud> clouds = new ArrayList<DeltaCloud>();
private ListenerList cloudManagerListeners;
private DeltaCloudManager() {
+ loadClouds();
}
+ private void loadClouds() {
+ IPath stateLocation = Activator.getDefault().getStateLocation();
+ File cloudFile = stateLocation.append(CLOUDFILE_NAME).toFile();
+ DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+ try {
+ DocumentBuilder db = dbf.newDocumentBuilder();
+ if (cloudFile.exists()) {
+ Document d = db.parse(cloudFile);
+ Element e = d.getDocumentElement();
+ // Get the stored configuration data
+ NodeList cloudNodes = e.getElementsByTagName("cloud"); // $NON-NLS-1$
+ for (int x = 0; x < cloudNodes.getLength(); ++x) {
+ Node n = cloudNodes.item(x);
+ NamedNodeMap attrs = n.getAttributes();
+ Node nameNode = attrs.getNamedItem("name"); // $NON-NLS-1$
+ Node urlNode = attrs.getNamedItem("url"); // $NON-NLS-1$
+ Node usernameNode = attrs.getNamedItem("username"); // $NON-NLS-1$
+ String name = nameNode.getNodeValue();
+ String url = urlNode.getNodeValue();
+ String username = usernameNode.getNodeValue();
+ String key = DeltaCloud.getPreferencesKey(url, username);
+ ISecurePreferences root = SecurePreferencesFactory.getDefault();
+ ISecurePreferences node = root.node(key);
+ String password;
+ try {
+ password = node.get("password", null); //$NON-NLS-1$
+ DeltaCloud cloud = new DeltaCloud(name, url, username, password);
+ clouds.add(cloud);
+ } catch (Exception e1) {
+ Activator.log(e1);
+ continue; // skip cloud
+ }
+ }
+ }
+ } catch (ParserConfigurationException e) {
+ Activator.log(e);
+ } catch (SAXException e) {
+ Activator.log(e);
+ } catch (IOException e) {
+ Activator.log(e);
+ }
+ }
+
+ private void saveClouds() {
+ try {
+ IPath stateLocation = Activator.getDefault().getStateLocation();
+ File cloudFile = stateLocation.append(CLOUDFILE_NAME).toFile();
+ if (!cloudFile.exists())
+ cloudFile.createNewFile();
+ if (cloudFile.exists()) {
+ PrintWriter p = new PrintWriter(new BufferedWriter(new FileWriter(cloudFile)));
+ p.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); //$NON-NLS-1$
+ p.println("<clouds>"); // $NON-NLS-1$
+ for (DeltaCloud d : clouds) {
+ p.println("<cloud name=\"" + d.getName() + "\" url=\"" //$NON-NLS-1$ //$NON-NLS-2$
+ + d.getURL() +
+ "\" username=\"" + d.getUsername() + "\"/>"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+ p.println("</clouds>"); //$NON-NLS-1$
+ p.close();
+ }
+ } catch (Exception e) {
+ Activator.log(e);
+ }
+ }
+
public static DeltaCloudManager getDefault() {
if (cloudManager == null)
cloudManager = new DeltaCloudManager();
@@ -22,16 +108,6 @@
}
public DeltaCloud[] getClouds() {
- // FIXME: testing only
-// if (clouds.size() == 0) {
-// try {
-// DeltaCloud x = new DeltaCloud("Red Hat Cloud", new URL("http://localhost:3001/api"), "mockuser", "mockpassword");
-// addCloud(x);
-// } catch (MalformedURLException e) {
-// // TODO Auto-generated catch block
-// e.printStackTrace();
-// }
-// }
return clouds.toArray(new DeltaCloud[clouds.size()]);
}
@@ -45,11 +121,33 @@
public void addCloud(DeltaCloud d) {
clouds.add(d);
+ saveClouds();
notifyListeners(ICloudManagerListener.ADD_EVENT);
}
public void removeCloud(DeltaCloud d) {
clouds.remove(d);
+ String url = d.getURL();
+ String userName = d.getUsername();
+ // check if we have a duplicate cloud connection using the same
+ // url/username combo.
+ boolean found = false;
+ for (DeltaCloud cloud : clouds) {
+ if (cloud.getURL().equals(url) && cloud.getUsername().equals(userName)) {
+ found = true;
+ break;
+ }
+ }
+ // if we have removed a cloud and no other cloud shares the
+ // url/username combo, then we should clear the node out which
+ // includes the password.
+ if (!found) {
+ ISecurePreferences root = SecurePreferencesFactory.getDefault();
+ String key = DeltaCloud.getPreferencesKey(d.getURL(), d.getUsername());
+ ISecurePreferences node = root.node(key);
+ node.clear();
+ }
+ saveClouds();
notifyListeners(ICloudManagerListener.REMOVE_EVENT);
}
15 years, 8 months
- 1
- 0
JBoss Tools SVN: r24185 - trunk/as/plugins/org.jboss.ide.eclipse.as.core.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-08-16 14:58:09 -0400 (Mon, 16 Aug 2010)
New Revision: 24185
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
Log:
https://jira.jboss.org/browse/JBIDE-6612 Helios does not recognize JBoss 6.0 Runtime as JEE6 environment
patch has been applied to the trunk
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2010-08-16 14:03:42 UTC (rev 24184)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2010-08-16 18:58:09 UTC (rev 24185)
@@ -348,19 +348,19 @@
version="6.0">
<moduleType
types="jst.appclient"
- versions="5.0"/>
+ versions="5.0, 6.0"/>
<moduleType
types="jst.web"
versions="2.2, 2.3, 2.4, 2.5, 3.0"/>
<moduleType
types="jst.ejb"
- versions="1.0, 1.1, 2.0, 2.1, 3.0"/>
+ versions="1.0, 1.1, 2.0, 2.1, 3.0, 3.1"/>
<moduleType
types="jst.ear"
- versions="1.2, 1.3, 1.4, 5.0"/>
+ versions="1.2, 1.3, 1.4, 5.0, 6.0"/>
<moduleType
types="jst.connector"
- versions="1.0, 1.5"/>
+ versions="1.0, 1.5, 1.6"/>
<moduleType
types="jst.utility"
versions="1.0"/>
@@ -798,10 +798,10 @@
<facet id="jst.web" version="2.2,2.3,2.4,2.5,3.0"/>
<facet id="jst.java" version="5.0,6.0"/>
<facet id="jst.utility" version="1.0"/>
- <facet id="jst.connector" version="1.0,1.5"/>
- <facet id="jst.ejb" version="2.0,2.1,3.0"/>
- <facet id="jst.ear" version="1.2,1.3,1.4,5.0"/>
- <facet id="jst.appclient" version="1.2,1.3,1.4,5.0"/>
+ <facet id="jst.connector" version="1.0,1.5,1.6"/>
+ <facet id="jst.ejb" version="2.0,2.1,3.0,3.1"/>
+ <facet id="jst.ear" version="1.2,1.3,1.4,5.0,6.0"/>
+ <facet id="jst.appclient" version="1.2,1.3,1.4,5.0,6.0"/>
</supported>
</extension>
15 years, 8 months
- 1
- 0
JBoss Tools SVN: r24184 - in trunk/as: plugins and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-08-16 10:03:42 -0400 (Mon, 16 Aug 2010)
New Revision: 24184
Modified:
trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.xml
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/META-INF/MANIFEST.MF
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/META-INF/MANIFEST.MF
trunk/as/plugins/pom.xml
Log:
Adding RSE to build, again. Changes to manifest versions and pom.xml
Modified: trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.xml
===================================================================
--- trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.xml 2010-08-16 13:59:20 UTC (rev 24183)
+++ trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.xml 2010-08-16 14:03:42 UTC (rev 24184)
@@ -147,5 +147,19 @@
install-size="0"
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.jboss.ide.eclipse.as.rse.core"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+ <plugin
+ id="org.jboss.ide.eclipse.as.rse.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+
</feature>
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/META-INF/MANIFEST.MF 2010-08-16 13:59:20 UTC (rev 24183)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/META-INF/MANIFEST.MF 2010-08-16 14:03:42 UTC (rev 24184)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Core
Bundle-SymbolicName: org.jboss.ide.eclipse.as.rse.core;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 0.9.0.qualifier
Bundle-Activator: org.jboss.ide.eclipse.as.rse.core.RSECorePlugin
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.rse.core,
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/META-INF/MANIFEST.MF 2010-08-16 13:59:20 UTC (rev 24183)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/META-INF/MANIFEST.MF 2010-08-16 14:03:42 UTC (rev 24184)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Ui
Bundle-SymbolicName: org.jboss.ide.eclipse.as.rse.ui;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 0.9.0.qualifier
Bundle-Activator: org.jboss.ide.eclipse.as.rse.ui.RSEUIPlugin
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui,
Modified: trunk/as/plugins/pom.xml
===================================================================
--- trunk/as/plugins/pom.xml 2010-08-16 13:59:20 UTC (rev 24183)
+++ trunk/as/plugins/pom.xml 2010-08-16 14:03:42 UTC (rev 24184)
@@ -17,6 +17,8 @@
<module>org.jboss.ide.eclipse.as.ui.mbeans</module>
<module>org.jboss.ide.eclipse.as.wtp.core</module>
<module>org.jboss.ide.eclipse.as.wtp.ui</module>
+ <module>org.jboss.ide.eclipse.as.rse.core</module>
+ <module>org.jboss.ide.eclipse.as.rse.ui</module>
</modules>
</project>
15 years, 8 months
- 1
- 0
JBoss Tools SVN: r24183 - trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties.
by jbosstools-commits＠lists.jboss.org
Author: bbrodt
Date: 2010-08-16 09:59:20 -0400 (Mon, 16 Aug 2010)
New Revision: 24183
Modified:
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/NamespacePrefixesProvider.java
Log:
https://jira.jboss.org/browse/JBIDE-6840
Fix compile error
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/NamespacePrefixesProvider.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/NamespacePrefixesProvider.java 2010-08-16 13:14:37 UTC (rev 24182)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/NamespacePrefixesProvider.java 2010-08-16 13:59:20 UTC (rev 24183)
@@ -24,9 +24,10 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
-import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
//import org.eclipse.bpel.model.Import;
import org.eclipse.bpel.model.Process;
@@ -73,7 +74,7 @@
while (context!=null)
{
Map<String, String> map = BPELUtils.getNamespaceMap(context);
- for (Map.Entry e : map.entrySet())
+ for (Map.Entry<String,String> e : map.entrySet())
{
String ns = e.getValue().toString();
NamespacePrefixElement elem = new NamespacePrefixElement((String)e.getKey(), ns, context,null);
@@ -148,7 +149,7 @@
list.addAll(elements);
// sort list alphabetically on prefix name
- Collections.sort(list,new Comparator()
+ Collections.sort(list,new Comparator<Object>()
{
@Override
public int compare(Object o1, Object o2) {
@@ -157,10 +158,16 @@
});
}
- private void recurseImports(Map<Object,Object> m, List<Object> imports, List<NamespacePrefixElement>elements)
+ @SuppressWarnings("unchecked")
+ private void recurseImports(@SuppressWarnings("rawtypes") Map m, List<Object> imports, List<NamespacePrefixElement>elements)
{
- for (Map.Entry e : m.entrySet())
+ @SuppressWarnings("rawtypes")
+ Iterator iter=m.entrySet().iterator();
+
+ while(iter.hasNext())
{
+ @SuppressWarnings("rawtypes")
+ Map.Entry e = (Entry) iter.next();
ArrayList<org.eclipse.wst.wsdl.Import> v = (ArrayList<org.eclipse.wst.wsdl.Import>)e.getValue();
for (org.eclipse.wst.wsdl.Import wsdlImp : v)
{
@@ -196,7 +203,7 @@
if (elem.location==null)
{
Map<Object,Object> ns = wsdlImp.getDefinition().getNamespaces();
- for (Map.Entry ens : ns.entrySet())
+ for (Map.Entry<Object,Object> ens : ns.entrySet())
{
if (ens.getValue().equals(elem.namespace))
{
15 years, 8 months
- 1
- 0
JBoss Tools SVN: r24182 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-08-16 09:14:37 -0400 (Mon, 16 Aug 2010)
New Revision: 24182
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlELCompletionProposalComputer.java
Log:
https://jira.jboss.org/browse/JBIDE-6843 Code completion doesn't work within #{} - FIXED
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlELCompletionProposalComputer.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlELCompletionProposalComputer.java 2010-08-16 12:27:43 UTC (rev 24181)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlELCompletionProposalComputer.java 2010-08-16 13:14:37 UTC (rev 24182)
@@ -136,6 +136,7 @@
// If it is true we don't need to start any new tag proposals
TextRegion prefix = getELPrefix(contentAssistRequest);
if (prefix != null && prefix.isELStarted()) {
+ addAttributeValueELProposals(contentAssistRequest, context);
return;
}
15 years, 8 months
- 1
- 0
JBoss Tools SVN: r24181 - trunk/usage/plugins/org.jboss.tools.usage/bin.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-08-16 08:27:43 -0400 (Mon, 16 Aug 2010)
New Revision: 24181
Removed:
trunk/usage/plugins/org.jboss.tools.usage/bin/org/
Log:
[JBIDE-6376] bin directory removed from svn
15 years, 8 months
- 1
- 0
JBoss Tools SVN: r24180 - in trunk/usage/tests/org.jboss.tools.usage.test: META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-08-16 08:25:49 -0400 (Mon, 16 Aug 2010)
New Revision: 24180
Added:
trunk/usage/tests/org.jboss.tools.usage.test/about.html
Modified:
trunk/usage/tests/org.jboss.tools.usage.test/META-INF/MANIFEST.MF
Log:
[JBIDE-6376] plugin name updated, about files added
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-08-16 12:25:27 UTC (rev 24179)
+++ trunk/usage/tests/org.jboss.tools.usage.test/META-INF/MANIFEST.MF 2010-08-16 12:25:49 UTC (rev 24180)
@@ -1,9 +1,9 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: Tests for JBoss Tools Google Analytics
+Bundle-Name: Tests for JBoss Tools Usage Reporting
Bundle-SymbolicName: org.jboss.tools.usage.test
Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.jboss.tools.usage;bundle-version="1.0.0",
org.eclipse.osgi;bundle-version="3.5.2",
org.eclipse.core.runtime;bundle-version="3.5.0",
Added: trunk/usage/tests/org.jboss.tools.usage.test/about.html
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/about.html (rev 0)
+++ trunk/usage/tests/org.jboss.tools.usage.test/about.html 2010-08-16 12:25:49 UTC (rev 24180)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Smooks Core</title>
+<style type="text/css" media="screen">
+<!--
+ body {
+ font-family: Sans-serif, Arial, Helvetica;
+ }
+
+-->
+</style>
+</head>
+<body>
+<h1>JBoss Usage Reporting</h1>
+
+<p>
+This plugin is part of the JBoss Tools developed by the <a href="http://www.jboss.com">JBoss Inc.</a>
+</p>
+
+<p>Information about this plugin is available at <a href="http://www.jboss.org/tools">JBoss Tools project page</a></p>
+
+<p>
+This software is distributed under the terms of the Eclipse Public License - v 1.0
+(see <a href="www.eclipse.org/legal/epl-v10.html">Eclipse Public License - Version 1.0</a>).
+</p>
+</body>
+</html>
\ No newline at end of file
Property changes on: trunk/usage/tests/org.jboss.tools.usage.test/about.html
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 8 months
- 1
- 0
JBoss Tools SVN: r24179 - in trunk/usage/plugins/org.jboss.tools.usage: META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-08-16 08:25:27 -0400 (Mon, 16 Aug 2010)
New Revision: 24179
Added:
trunk/usage/plugins/org.jboss.tools.usage/about.html
Modified:
trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF
Log:
[JBIDE-6376] plugin name updated, about files added
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-16 11:04:19 UTC (rev 24178)
+++ trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF 2010-08-16 12:25:27 UTC (rev 24179)
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: JBoss Tools Google Analytics
+Bundle-Name: JBoss Tools Usage Reporting
Bundle-SymbolicName: org.jboss.tools.usage;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Added: trunk/usage/plugins/org.jboss.tools.usage/about.html
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/about.html (rev 0)
+++ trunk/usage/plugins/org.jboss.tools.usage/about.html 2010-08-16 12:25:27 UTC (rev 24179)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Smooks Core</title>
+<style type="text/css" media="screen">
+<!--
+ body {
+ font-family: Sans-serif, Arial, Helvetica;
+ }
+
+-->
+</style>
+</head>
+<body>
+<h1>JBoss Usage Reporting</h1>
+
+<p>
+This plugin is part of the JBoss Tools developed by the <a href="http://www.jboss.com">JBoss Inc.</a>
+</p>
+
+<p>Information about this plugin is available at <a href="http://www.jboss.org/tools">JBoss Tools project page</a></p>
+
+<p>
+This software is distributed under the terms of the Eclipse Public License - v 1.0
+(see <a href="www.eclipse.org/legal/epl-v10.html">Eclipse Public License - Version 1.0</a>).
+</p>
+</body>
+</html>
\ No newline at end of file
Property changes on: trunk/usage/plugins/org.jboss.tools.usage/about.html
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 8 months
- 1
- 0
JBoss Tools SVN: r24178 - in trunk/usage/tests/org.jboss.tools.usage.test: src/org/jboss/tools/usage/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-08-16 07:04:19 -0400 (Mon, 16 Aug 2010)
New Revision: 24178
Added:
trunk/usage/tests/org.jboss.tools.usage.test/EclipseEnvironmentTest.launch
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmenTest.java
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmentFake.java
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageTestSuite.java
Modified:
trunk/usage/tests/org.jboss.tools.usage.test/FocusPointTest.launch
trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageRequestsTest.launch
trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageTest.launch
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/FocusPointTest.java
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GoogleAnalyticsUrlStrategyTest.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/JBossToolsUsageTest.java
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/SystemOutLogger.java
Log:
[JBIDE-6376] user agent string corrected, tests added
Added: trunk/usage/tests/org.jboss.tools.usage.test/EclipseEnvironmentTest.launch
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/EclipseEnvironmentTest.launch (rev 0)
+++ trunk/usage/tests/org.jboss.tools.usage.test/EclipseEnvironmentTest.launch 2010-08-16 11:04:19 UTC (rev 24178)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/GoogleAnalyticsUrlStrategyTest (1)"/>
+<booleanAttribute key="default" value="false"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmenTest.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.tools.usage.test.EclipseEnvironmenTest"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.tools.usage.test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="com.jboss.jbds.product.product"/>
+<booleanAttribute key="run_in_ui_thread" value="true"/>
+<stringAttribute key="selected_target_plugins" value="javax.transaction@default:false,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.hamcrest.core@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.common@2:true,org.eclipse.text@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.contenttype@default:default,org.eclipse.core.commands@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.jface.databinding@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.core.expressions@default:default,org.junit4@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ui.workb!
ench@default:default,org.eclipse.jface.text@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.equinox.app@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.equinox.preferences@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.equinox.transforms.hook@default:false,com.ibm.icu@default:default,org.eclipse.core.variables@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.ui.views@default:default,org.eclipse.core.resources.compatibility@default:false,org.eclipse.equinox.security.macosx@default:false,org.eclipse.swt@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.help@default:default,org.eclipse.osgi@-1:true,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.core.filesystem@default:default,o!
rg.eclipse.ecf@default:default,org.eclipse.core.databinding@de!
fault:de
fault,org.eclipse.core.jobs@default:default,org.eclipse.ant.core@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.equinox.concurrent@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.swt.cocoa.macosx@default:false,org.eclipse.ui@default:default,org.eclipse.core.net@default:default,org.eclipse.equinox.security@default:default,org.eclipse.ui.ide@default:default,org.eclipse.jface@default:default,javax.servlet@default:default,org.eclipse.osgi.services@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage.test@default:default,org.jboss.tools.usage@default:default"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="true"/>
+<booleanAttribute key="useProduct" value="false"/>
+</launchConfiguration>
Property changes on: trunk/usage/tests/org.jboss.tools.usage.test/EclipseEnvironmentTest.launch
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/usage/tests/org.jboss.tools.usage.test/FocusPointTest.launch
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/FocusPointTest.launch 2010-08-16 11:01:36 UTC (rev 24177)
+++ trunk/usage/tests/org.jboss.tools.usage.test/FocusPointTest.launch 2010-08-16 11:04:19 UTC (rev 24178)
@@ -35,8 +35,8 @@
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="com.jboss.jbds.product.product"/>
<booleanAttribute key="run_in_ui_thread" value="false"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.net@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ui.ide@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.core.runtime@default:true,org.eclipse.ui.forms@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.osgi.services@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.jface.text@default:default,org.eclipse.core.databinding@default:default,org.eclipse.!
help@default:default,org.eclipse.equinox.security@default:default,org.eclipse.swt.cocoa.macosx@default:false,org.junit4@default:default,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.ui@default:default,org.eclipse.equinox.app@default:default,org.eclipse.core.variables@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.text@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.resources.compatibility@default:false,org.eclipse.ecf.identity@default:default,org.hamcrest.core@default:default,org.eclipse.ecf.ssl@default:false,javax.servlet@default:default,org.eclipse.equinox.preferences@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.jface@default:default,com.ibm.icu@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.ant.core@default:default,org.eclipse.ecf.provid!
er.filetransfer.ssl@default:false,javax.transaction@default:fa!
lse,org.
eclipse.core.databinding.observable@default:default,org.eclipse.ecf@default:default,org.eclipse.core.jobs@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt@default:default,org.eclipse.ui.views@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.equinox.common@2:true,org.eclipse.core.expressions@default:default,org.eclipse.equinox.security.macosx@default:false,org.eclipse.equinox.p2.metadata@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage.test@default:default,org.jboss.tools.usage@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.common@2:true,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.equinox.concurrent@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,com.ibm.icu@default:default,org.junit4@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.app@default:default,org.eclipse.core.resources@default:default,org.eclipse.ui.ide@default:default,org.eclipse.osgi@-1:true,org.eclipse.ecf@default:default,org.hamcrest.core@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.help@default:default,org.eclipse.core.jobs@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.core.contentty!
pe@default:default,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.equinox.security.macosx@default:false,org.eclipse.equinox.p2.repository@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.osgi.services@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.commands@default:default,org.eclipse.swt@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.equinox.security@default:default,org.eclipse.jface@default:default,org.eclipse.core.variables@default:default,org.eclipse.text@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.views@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.equinox.preferences@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.expressions@default:default,org!
.eclipse.ui@default:default,org.eclipse.core.runtime.compatibi!
lity.aut
h@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.swt.cocoa.macosx@default:false,org.eclipse.core.resources.compatibility@default:false,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.jface.text@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.databinding@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.core.net@default:default,org.eclipse.equinox.p2.core@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage*1.0.0.qualifier@default:default,org.jboss.tools.usage.test@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useDefaultConfig" value="true"/>
Modified: trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageRequestsTest.launch
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageRequestsTest.launch 2010-08-16 11:01:36 UTC (rev 24177)
+++ trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageRequestsTest.launch 2010-08-16 11:04:19 UTC (rev 24178)
@@ -10,7 +10,7 @@
<booleanAttribute key="clearConfig" value="true"/>
<booleanAttribute key="clearws" value="true"/>
<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/JBossToolsUsageRequestsTest2"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/JBossToolsUsageRequestsTest"/>
<booleanAttribute key="default" value="false"/>
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
@@ -36,7 +36,7 @@
<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.ui@default:default,org.eclipse.ecf@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.expressions@default:default,javax.servlet@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.osgi.services@default:default,javax.transaction@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.swt.cocoa.macosx@default:false,org.eclipse.ui.ide@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.!
ui.forms@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.equinox.security@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.net@default:default,com.ibm.icu@default:default,org.eclipse.jface.text@default:default,org.eclipse.osgi@-1:true,org.eclipse.equinox.common@2:true,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.jface.databinding@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.text@default:default,org.eclipse.core.databinding@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.transforms.hook@default:false,org.junit4@default:default,org.hamcrest.core@default:default,org.jboss.tools.xulrunner.initializer@default:false!
,org.eclipse.equinox.app@default:default,org.eclipse.swt@defau!
lt:defau
lt,org.eclipse.core.variables@default:default,org.eclipse.jface@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.core.resources.compatibility@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.commands@default:default,org.eclipse.help@default:default,org.eclipse.ui.views@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.security.macosx@default:false,org.eclipse.equinox.preferences@default:default"/>
+<stringAttribute key="selected_target_plugins" value="javax.transaction@default:false,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.hamcrest.core@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.common@default:default,org.eclipse.text@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.contenttype@default:default,org.eclipse.core.commands@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.jface.databinding@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.core.expressions@default:default,org.junit4@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse!
.ui.workbench@default:default,org.eclipse.jface.text@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.equinox.app@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.equinox.preferences@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.equinox.transforms.hook@default:false,com.ibm.icu@default:default,org.eclipse.core.variables@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.ui.views@default:default,org.eclipse.core.resources.compatibility@default:false,org.eclipse.equinox.security.macosx@default:false,org.eclipse.swt@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.help@default:default,org.eclipse.osgi,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.core.filesystem@default:default,!
org.eclipse.ecf@default:default,org.eclipse.core.databinding@d!
efault:d
efault,org.eclipse.core.jobs@default:default,org.eclipse.ant.core@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.equinox.concurrent@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.swt.cocoa.macosx@default:false,org.eclipse.ui@default:default,org.eclipse.core.net@default:default,org.eclipse.equinox.security@default:default,org.eclipse.ui.ide@default:default,org.eclipse.jface@default:default,javax.servlet@default:default,org.eclipse.osgi.services@default:default"/>
<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage.test@default:default,org.jboss.tools.usage@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
Modified: trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageTest.launch
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageTest.launch 2010-08-16 11:01:36 UTC (rev 24177)
+++ trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageTest.launch 2010-08-16 11:04:19 UTC (rev 24178)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
<booleanAttribute key="append.args" value="true"/>
+<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
<booleanAttribute key="askclear" value="false"/>
<booleanAttribute key="automaticAdd" value="true"/>
<booleanAttribute key="automaticValidate" value="false"/>
@@ -35,8 +36,8 @@
<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.ui@default:default,org.eclipse.ecf@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.expressions@default:default,javax.servlet@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.osgi.services@default:default,javax.transaction@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.swt.cocoa.macosx@default:false,org.eclipse.ui.ide@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.!
ui.forms@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.equinox.security@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.net@default:default,com.ibm.icu@default:default,org.eclipse.jface.text@default:default,org.eclipse.osgi@-1:true,org.eclipse.equinox.common@2:true,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.jface.databinding@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.text@default:default,org.eclipse.core.databinding@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.transforms.hook@default:false,org.junit4@default:default,org.hamcrest.core@default:default,org.jboss.tools.xulrunner.initializer@default:false!
,org.eclipse.equinox.app@default:default,org.eclipse.swt@defau!
lt:defau
lt,org.eclipse.core.variables@default:default,org.eclipse.jface@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.core.resources.compatibility@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.commands@default:default,org.eclipse.help@default:default,org.eclipse.ui.views@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.security.macosx@default:false,org.eclipse.equinox.preferences@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage.test@default:default,org.jboss.tools.usage@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.common@2:true,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.equinox.concurrent@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,com.ibm.icu@default:default,org.junit4@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.app@default:default,org.eclipse.core.resources@default:default,org.eclipse.ui.ide@default:default,org.eclipse.osgi@-1:true,org.eclipse.ecf@default:default,org.hamcrest.core@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.help@default:default,org.eclipse.core.jobs@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.core.contentty!
pe@default:default,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.equinox.security.macosx@default:false,org.eclipse.equinox.p2.repository@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.osgi.services@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,javax.transaction@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.commands@default:default,org.eclipse.swt@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.equinox.security@default:default,org.eclipse.jface@default:default,org.eclipse.core.variables@default:default,org.eclipse.text@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.views@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.equinox.preferences@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core!
.expressions@default:default,org.eclipse.ui@default:default,or!
g.eclips
e.core.runtime.compatibility.auth@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.swt.cocoa.macosx@default:false,org.eclipse.core.resources.compatibility@default:false,javax.servlet@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.jface.text@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.databinding@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.core.net@default:default,org.eclipse.equinox.p2.core@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage*1.0.0.qualifier@default:default,org.jboss.tools.usage.test@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
Added: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmenTest.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmenTest.java (rev 0)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmenTest.java 2010-08-16 11:04:19 UTC (rev 24178)
@@ -0,0 +1,83 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.UnsupportedEncodingException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.eclipse.core.runtime.Platform;
+import org.jboss.tools.usage.internal.EclipseEnvironment;
+import org.junit.Test;
+
+public class EclipseEnvironmenTest {
+
+ private static final String GANALYTICS_ACCOUNTNAME = "UA-17645367-1";
+ private static final String HOSTNAME = "jboss.org";
+ private static final String REFERRAL = "0";
+ private static final String LOCALE_US = "en_US";
+
+ @Test
+ public void testMacOs() throws UnsupportedEncodingException {
+ EclipseEnvironment eclipseEnvironment = new EclipseEnvironmentFake(GANALYTICS_ACCOUNTNAME, HOSTNAME, REFERRAL,
+ Platform.OS_MACOSX, LOCALE_US);
+ String userAgent = eclipseEnvironment.getUserAgent();
+ assertApplicationNameAndVersion("com.jboss.jbds.product", "3.0.1", userAgent);
+ assertOs("Macintosh", "Intel Mac OS X 10.5", userAgent);
+ assertLanguage("en-US", userAgent);
+ }
+
+ @Test
+ public void testLinux() throws UnsupportedEncodingException {
+ EclipseEnvironment eclipseEnvironment = new EclipseEnvironmentFake(GANALYTICS_ACCOUNTNAME, HOSTNAME, REFERRAL,
+ Platform.OS_LINUX, LOCALE_US);
+ String userAgent = eclipseEnvironment.getUserAgent();
+ assertApplicationNameAndVersion("com.jboss.jbds.product", "3.0.1", userAgent);
+ assertOs("X11", "Linux i686", userAgent);
+ assertLanguage("en-US", userAgent);
+ }
+
+ @Test
+ public void testWindows() throws UnsupportedEncodingException {
+ EclipseEnvironment eclipseEnvironment = new EclipseEnvironmentFake(GANALYTICS_ACCOUNTNAME, HOSTNAME, REFERRAL,
+ Platform.OS_WIN32, LOCALE_US);
+ String userAgent = eclipseEnvironment.getUserAgent();
+ assertApplicationNameAndVersion("com.jboss.jbds.product", "3.0.1", userAgent);
+ assertOs("Windows", "Windows NT 6.1", userAgent);
+ assertLanguage("en-US", userAgent);
+ }
+
+ private void assertApplicationNameAndVersion(String applicationName, String applicationVersion, String userAgent) {
+ Matcher matcher = Pattern.compile("([a-zA-Z\\.]+)/([0-9\\.]+).+").matcher(userAgent);
+ assertTrue(matcher.matches());
+ assertEquals(2, matcher.groupCount());
+ assertEquals(applicationName, matcher.group(1));
+ assertEquals(applicationVersion, matcher.group(2));
+ }
+
+ private void assertOs(String platform, String os, String userAgent) {
+ Matcher matcher = Pattern.compile(".+ \\((.+); U; (.+); .+\\)").matcher(userAgent);
+ assertTrue(matcher.matches());
+ assertEquals(2, matcher.groupCount());
+ assertEquals(platform, matcher.group(1));
+ assertEquals(os, matcher.group(2));
+ }
+
+ private void assertLanguage(String language, String userAgent) {
+ Matcher matcher = Pattern.compile(".+ \\(.+; U; .+ .+; (.+)\\)").matcher(userAgent);
+ assertTrue(matcher.matches());
+ assertEquals(1, matcher.groupCount());
+ assertEquals(language, matcher.group(1));
+ }
+}
Property changes on: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmenTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmentFake.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmentFake.java (rev 0)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmentFake.java 2010-08-16 11:04:19 UTC (rev 24178)
@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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.internal.EclipseEnvironment;
+
+public class EclipseEnvironmentFake extends EclipseEnvironment {
+
+ private String locale;
+ private String os;
+
+ public EclipseEnvironmentFake(String accountName, String hostName, String referral, String os, String locale) {
+ super(accountName, hostName, referral);
+ this.os = os;
+ this.locale = locale;
+ }
+
+ @Override
+ protected void initScreenSettings() {
+ // do not access swt/display
+ }
+
+ @Override
+ public String getScreenResolution() {
+ return 1920 + SCREERESOLUTION_DELIMITER + 1080;
+ }
+
+ @Override
+ public String getScreenColorDepth() {
+ return 24 + SCREENCOLORDEPTH_POSTFIX;
+ }
+
+ @Override
+ protected String getApplicationName() {
+ return "com.jboss.jbds.product";
+ }
+
+ @Override
+ protected String getNL() {
+ return locale;
+ }
+
+ @Override
+ protected String getOS() {
+ return os;
+ }
+
+ @Override
+ protected String getApplicationVersion() {
+ return "3.0.1";
+ }
+
+}
Property changes on: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/EclipseEnvironmentFake.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/FocusPointTest.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/FocusPointTest.java 2010-08-16 11:01:36 UTC (rev 24177)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/FocusPointTest.java 2010-08-16 11:04:19 UTC (rev 24178)
@@ -1,6 +1,16 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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.jgoogleanalytics.FocusPoint;
+import org.jboss.tools.usage.googleanalytics.FocusPoint;
import org.jboss.tools.usage.util.EncodingUtils;
import junit.framework.TestCase;
@@ -8,8 +18,11 @@
public class FocusPointTest extends TestCase {
private static final String root = "root";
+
private static final String child1 = "child1";
+
private static final String URI_SEPARATOR_ENCODED = EncodingUtils.checkedEncodeUtf8(FocusPoint.URI_SEPARATOR);
+
private static final String TITLE_SEPARATOR_ENCODED = EncodingUtils.checkedEncodeUtf8(FocusPoint.TITLE_SEPARATOR);
public void testGetContentURI_Simple() throws Exception {
@@ -39,5 +52,4 @@
assertNotNull(contentTitle);
assertEquals(root + TITLE_SEPARATOR_ENCODED + child1, contentTitle);
}
-
}
Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GoogleAnalyticsUrlStrategyTest.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GoogleAnalyticsUrlStrategyTest.java 2010-08-16 11:01:36 UTC (rev 24177)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GoogleAnalyticsUrlStrategyTest.java 2010-08-16 11:04:19 UTC (rev 24178)
@@ -14,10 +14,10 @@
import java.io.UnsupportedEncodingException;
-import org.jboss.tools.usage.jgoogleanalytics.EclipseEnvironment;
-import org.jboss.tools.usage.jgoogleanalytics.FocusPoint;
-import org.jboss.tools.usage.jgoogleanalytics.GoogleAnalyticsUrlStrategy;
-import org.jboss.tools.usage.jgoogleanalytics.IGoogleAnalyticsParameters;
+import org.eclipse.core.runtime.Platform;
+import org.jboss.tools.usage.googleanalytics.FocusPoint;
+import org.jboss.tools.usage.googleanalytics.IGoogleAnalyticsParameters;
+import org.jboss.tools.usage.internal.GoogleAnalyticsUrlStrategy;
import org.junit.Before;
import org.junit.Test;
@@ -25,6 +25,8 @@
private static final String GANALYTICS_ACCOUNTNAME = "UA-17645367-1";
private static final String HOSTNAME = "jboss.org";
+ private static final String REFERRAL = "0";
+ private static final String LOCALE_US = "en_US";
// private static final String COOKIE_DELIMITER = EncodingUtils.checkedEncodeUtf8(String
// .valueOf(IGoogleAnalyticsParameters.PLUS_SIGN));
@@ -37,7 +39,7 @@
}
@Test
- public void testUrlIsBuiltCorrectly() throws UnsupportedEncodingException {
+ public void testUrlIsCorrect() throws UnsupportedEncodingException {
FocusPoint focusPoint = new FocusPoint("testing").setChild(new FocusPoint("strategy"));
String url = urlStrategy.build(focusPoint);
String targetUrl = "http://www.google-analytics.com/__utm.gif?"
@@ -114,31 +116,29 @@
}
private class EclipseEnvironmentGAUrlStrategy extends GoogleAnalyticsUrlStrategy {
+
private EclipseEnvironmentGAUrlStrategy() {
- super(new EclipseEnvironmentFake());
- }
- }
+ super(new EclipseEnvironmentFake(GANALYTICS_ACCOUNTNAME, HOSTNAME, REFERRAL, Platform.OS_LINUX, LOCALE_US) {
- private class EclipseEnvironmentFake extends EclipseEnvironment {
+ @Override
+ public String getScreenColorDepth() {
+ return "24-bit";
+ }
- public EclipseEnvironmentFake() {
- super(GANALYTICS_ACCOUNTNAME, HOSTNAME, "0");
- }
+ @Override
+ public String getScreenResolution() {
+ return "1920x1080";
+ }
- @Override
- protected void initScreenSettings() {
- // do not access swt/display
- }
+ @Override
+ public String getBrowserLanguage() {
+ return "en_us";
+ }
- @Override
- public String getScreenResolution() {
- return 1920 + SCREERESOLUTION_DELIMITER + 1080;
+ @Override
+ public String getUserId() {
+ return String.valueOf(System.currentTimeMillis());
+ }});
}
-
- @Override
- public String getScreenColorDepth() {
- return 24 + SCREENCOLORDEPTH_POSTFIX;
- }
-
}
}
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-08-16 11:01:36 UTC (rev 24177)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-08-16 11:04:19 UTC (rev 24178)
@@ -5,15 +5,24 @@
import java.io.IOException;
import java.net.HttpURLConnection;
-import org.jboss.tools.usage.jgoogleanalytics.HttpGetMethod;
+import org.jboss.tools.usage.googleanalytics.ILoggingAdapter;
+import org.jboss.tools.usage.internal.HttpGetMethod;
+import org.junit.Before;
import org.junit.Test;
public class JBossToolsUsageRequestsTest {
+ private ILoggingAdapter loggingAdapter;
+
+ @Before
+ public void setUp() {
+ this.loggingAdapter = new SystemOutLogger();
+ }
+
@Test
public void testUrl0() throws IOException {
String userAgent = "Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.4) Gecko/20100614 Ubuntu/10.04 (lucid) Firefox/10.0.0";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent);
+ TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
String url = "http://www.google-analytics.com/__utm.gif?"
+"utmwv=4.7.2"
+"&utmn=338321265"
@@ -38,7 +47,7 @@
@Test
public void testUrl0_0() throws IOException {
String userAgent = "com.jboss.jbds.product/3.0.1 (X11; U; Linux x86_64; en-US)";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent);
+ TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
String url = "http://www.google-analytics.com/__utm.gif?"
+"utmwv=4.7.2"
+"&utmn=338321288"
@@ -63,7 +72,7 @@
@Test
public void testUrl0_1() throws IOException {
String userAgent = "com.jboss.jbds.product/3.0.1 (X11; U; Linux x86_64; en-US; rv:1.9.2.4) Gecko/20100614 Ubuntu/10.04 (lucid) v201006010437R-H98-GA";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent);
+ TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
String url = "http://www.google-analytics.com/__utm.gif?"
+"utmwv=4.7.2"
+"&utmn=3383212651"
@@ -88,7 +97,7 @@
@Test
public void testUrl0_2() throws IOException {
String userAgent = "com.jboss.jbds.product/3.0.1 (X11; U; Linux x86_64; en-US; rv:1.9.2.4) Gecko/20100614 Ubuntu/10.04 (lucid) Eclipse/3.5.0";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent);
+ TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
String url = "http://www.google-analytics.com/__utm.gif?"
+"utmwv=4.7.2"
+"&utmn=3383212652"
@@ -113,7 +122,7 @@
@Test
public void testUrl0_3() throws IOException {
String userAgent = "com.jboss.jbds.product/3.0.1 (X11; U; Linux x86_64; en-US;) Eclipse/3.5.0";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent);
+ TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
String url = "http://www.google-analytics.com/__utm.gif?"
+"utmwv=4.7.2"
+"&utmn=3383212651"
@@ -138,7 +147,7 @@
@Test
public void testUrl0_4() throws IOException {
String userAgent = "com.jboss.jbds.product/3.0.1";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent);
+ TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
String url = "http://www.google-analytics.com/__utm.gif?"
+"utmwv=4.7.2"
+"&utmn=3383212651"
@@ -163,7 +172,7 @@
@Test
public void testUrl0_5() throws IOException {
String userAgent = "com.jboss.jbds.product/3.0.1 (Linux x86_64)";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent);
+ TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
String url = "http://www.google-analytics.com/__utm.gif?"
+"utmwv=4.7.2"
+"&utmn=33832126513"
@@ -188,7 +197,7 @@
@Test
public void testUrl0_6() throws IOException {
String userAgent = "Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.4) Gecko/20100614 Ubuntu/10.04 (lucid) com.jboss.jbds.product/3.0.1";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent);
+ TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
String url = "http://www.google-analytics.com/__utm.gif?"
+"utmwv=4.7.2"
+"&utmn=338321265"
@@ -213,7 +222,7 @@
@Test
public void testUrl0_7() throws IOException {
String userAgent = "com.jboss.jbds.product/3.0.1 (X11; U; Linux x86_64; en-US)";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent);
+ TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
String url = "http://www.google-analytics.com/__utm.gif?"
+"utmwv=4.7.2"
+"&utmn=338321268"
@@ -238,7 +247,7 @@
@Test
public void testUrl0_7_1() throws IOException {
String userAgent = "com.jboss.jbds.product/3.0.1 (X11; U; Linux x86_64; en-us)";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent);
+ TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
String url = "http://www.google-analytics.com/__utm.gif?"
+"utmwv=4.7.2"
+"&utmn=338321068"
@@ -263,7 +272,7 @@
@Test
public void testUrl0_7_2() throws IOException {
String userAgent = "com.jboss.jbds.product/3.0.1 (X11; U; Linux x86_64; en-US)";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent);
+ TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
String url = "http://www.google-analytics.com/__utm.gif?"
+"utmwv=4.7.2"
+"&utmn=338333268"
@@ -277,7 +286,7 @@
+"&utmr=0"
+"&utmp=%2Ftools%2Fusage%2FtestUrl0_7_2"
+"&utmac=UA-17645367-1"
- +"&utmcc=__utma%3D156660507.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
+ +"&utmcc=__utma%3D156620507.1285760111.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
+"&gaq=1";
method.request(url);
assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
@@ -286,10 +295,10 @@
@Test
public void testUrl0_7_3() throws IOException {
String userAgent = "com.jboss.jbds.product/3.0.1 (X11; U; Linux x86_64; en-US)";
- TestHttpGetMethod method = new TestHttpGetMethod(userAgent);
+ TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
String url = "http://www.google-analytics.com/__utm.gif?"
+"utmwv=4.7.2"
- +"&utmn=331333268"
+ +"&utmn=311333268"
+"&utmhn=jboss.org"
+"&utmcs=UTF-8"
+"&utmsr=1920x1080"
@@ -300,25 +309,117 @@
+"&utmr=0"
+"&utmp=%2Ftools%2Fusage%2FtestUrl0_7_3"
+"&utmac=UA-17645367-1"
- +"&utmcc=__utma%3D116660507.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
+ +"&utmcc=__utma%3D112660507.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
+"&gaq=1";
method.request(url);
assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
}
+
+ @Test
+ public void testUrl0_7_3_mac() throws IOException {
+ String userAgent = "com.jboss.jbds.product/3.0.1 (Macintosh; U; Intel Mac OS X 10.5; fr)";
+ TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
+ String url = "http://www.google-analytics.com/__utm.gif?"
+ +"utmwv=4.7.2"
+ +"&utmn=351333268"
+ +"&utmhn=jboss.org"
+ +"&utmcs=UTF-8"
+ +"&utmsr=1920x1080"
+ +"&utmsc=24-bit"
+ +"&utmul=en-us"
+ +"&utmdt=tools-usage-test_0_7_3"
+ +"&utmhid=1087431432"
+ +"&utmr=0"
+ +"&utmp=%2Ftools%2Fusage%2FtestUrl0_7_3_mac"
+ +"&utmac=UA-17645367-1"
+ +"&utmcc=__utma%3D133660507.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
+ +"&gaq=1";
+ method.request(url);
+ assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
+ }
+
+ @Test
+ public void testUrl0_7_3_win() throws IOException {
+ String userAgent = "com.jboss.jbds.product/3.0.1 (Windows; U; Windows NT 6.1; en-US)";
+ TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
+ String url = "http://www.google-analytics.com/__utm.gif?"
+ +"utmwv=4.7.2"
+ +"&utmn=351333254"
+ +"&utmhn=jboss.org"
+ +"&utmcs=UTF-8"
+ +"&utmsr=1920x1080"
+ +"&utmsc=24-bit"
+ +"&utmul=en-us"
+ +"&utmdt=tools-usage-test_0_7_3_win"
+ +"&utmhid=1087431432"
+ +"&utmr=0"
+ +"&utmp=%2Ftools%2Fusage%2FtestUrl0_7_3_win"
+ +"&utmac=UA-17645367-1"
+ +"&utmcc=__utma%3D133660522.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
+ +"&gaq=1";
+ method.request(url);
+ assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
+ }
+
+ @Test
+ public void testUrl0_7_3_1() throws IOException {
+ String userAgent = "com.jboss.jbds.product/3.0.1 (Windows; U; Windows NT 6.1; en-US)";
+ TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
+ String url = "http://www.google-analytics.com/__utm.gif?"
+ +"utmwv=4.7.2"
+ +"&utmn=358333254"
+ +"&utmhn=jboss.org"
+ +"&utmcs=UTF-8"
+ +"&utmsr=1920x1080"
+ +"&utmsc=24-bit"
+ +"&utmul=en-us"
+ +"&utmdt=tools-usage-test_0_7_3_1"
+ +"&utmhid=1087431432"
+ +"&utmr=smooks|seam|drools|esb"
+ +"&utmp=%2Ftools%2Fusage%2FtestUrl0_7_3_1"
+ +"&utmac=UA-17645367-1"
+ +"&utmcc=__utma%3D133860522.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3B"
+ +"&gaq=1";
+ method.request(url);
+ assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
+ }
+
+ @Test
+ public void testUrl8() throws IOException {
+ String userAgent = "com.jboss.jbds.product/3.0.1 (Windows; U; Windows NT 6.1; en-US)";
+ TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
+ String url = "http://www.google-analytics.com/__utm.gif?"
+ +"utmwv=4.7.2"
+ +"&utmn=453325272"
+ +"&utmhn=jboss.org"
+ +"&utmcs=UTF-8"
+ +"&utmsr=1920x1080"
+ +"&utmsc=24-bit"
+ +"&utmul=en-US"
+ +"&utmdt=jboss.org-tools-usage-instance"
+ +"&utmhid=1722580305"
+ +"&utmr=org.jboss.tools.usage.tests"
+ +"&utmp=%2Fjboss.org%2Ftools%2Fusage%2FtestUrl8"
+ +"&utmac=UA-17645367-1"
+ +"&utmcc=__utma%3D999.69517276658961975851281943564260.1281943564259.1281943564259.1281943564259.-1%3B%2B__utmz%3D999.1281943564259.1.1.utmcsr%3D%28direct%29%7Cutmccn%3D%28direct%29%7Cutmcmd%3D%28none%29%3B"
+ +"&gaq=1";
+ method.request(url);
+ assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
+ }
+
protected class TestHttpGetMethod extends HttpGetMethod {
private HttpURLConnection urlConnection;
- public TestHttpGetMethod(String userAgent) {
- super(userAgent);
+ public TestHttpGetMethod(String userAgent, ILoggingAdapter loggingAdapter) {
+ super(userAgent, loggingAdapter);
}
@Override
protected HttpURLConnection createURLConnection(String urlString,
String userAgent) throws IOException {
- this.urlConnection = super.createURLConnection(urlString, userAgent);
- return urlConnection;
+ return this.urlConnection = super.createURLConnection(urlString, userAgent);
}
public int getResponseCode() throws IOException {
Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageTest.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageTest.java 2010-08-16 11:01:36 UTC (rev 24177)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageTest.java 2010-08-16 11:04:19 UTC (rev 24178)
@@ -10,44 +10,45 @@
******************************************************************************/
package org.jboss.tools.usage.test;
-import org.jboss.tools.usage.IUsageTracker;
-import org.jboss.tools.usage.jgoogleanalytics.EclipseEnvironment;
-import org.jboss.tools.usage.jgoogleanalytics.FocusPoint;
-import org.jboss.tools.usage.jgoogleanalytics.IGoogleAnalyticsParameters;
-import org.jboss.tools.usage.jgoogleanalytics.Tracker;
-import org.jboss.tools.usage.jgoogleanalytics.PluginLogger;
+import org.eclipse.core.runtime.Platform;
+import org.jboss.tools.usage.ITracker;
+import org.jboss.tools.usage.googleanalytics.FocusPoint;
+import org.jboss.tools.usage.googleanalytics.IGoogleAnalyticsParameters;
+import org.jboss.tools.usage.googleanalytics.ILoggingAdapter;
+import org.jboss.tools.usage.googleanalytics.Tracker;
+import org.jboss.tools.usage.internal.PluginLogger;
import org.jboss.tools.usage.test.internal.JBossToolsUsageTestActivator;
import org.junit.Test;
public class JBossToolsUsageTest {
private static final String HOST_NAME = "jboss.org";
-
+ private static final String LOCALE_US = "en_US";
+
private FocusPoint focusPoint = new FocusPoint("jboss.org")
.setChild(new FocusPoint("tools")
.setChild(new FocusPoint("usage")
- .setChild(new FocusPoint("instance"))));
+ .setChild(new FocusPoint("test"))));
private static final String GANALYTICS_ACCOUNTNAME = "UA-17645367-1";
@Test
public void testTrackAsynchronously() throws Exception {
- IUsageTracker tracker = getGoogleAnalyticsTracker();
+ ITracker tracker = getGoogleAnalyticsTracker();
tracker.trackAsynchronously(focusPoint);
Thread.sleep(3000);
}
@Test
public void testTrackSynchronously() throws Exception {
- IUsageTracker tracker = getGoogleAnalyticsTracker();
+ ITracker tracker = getGoogleAnalyticsTracker();
tracker.trackSynchronously(focusPoint);
}
- private IUsageTracker getGoogleAnalyticsTracker() {
- IGoogleAnalyticsParameters eclipseSettings = new EclipseEnvironment(
- GANALYTICS_ACCOUNTNAME, HOST_NAME, JBossToolsUsageTestActivator.PLUGIN_ID);
- Tracker tracker = new Tracker(eclipseSettings);
- tracker.setLoggingAdapter(new PluginLogger(JBossToolsUsageTestActivator.getDefault()));
- return tracker;
+ private ITracker getGoogleAnalyticsTracker() {
+ IGoogleAnalyticsParameters eclipseSettings = new EclipseEnvironmentFake(
+ GANALYTICS_ACCOUNTNAME, HOST_NAME, JBossToolsUsageTestActivator.PLUGIN_ID, Platform.OS_LINUX, LOCALE_US);
+ ILoggingAdapter loggingAdapter = new PluginLogger(JBossToolsUsageTestActivator.getDefault());
+ return new Tracker(eclipseSettings, loggingAdapter);
}
}
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-08-16 11:01:36 UTC (rev 24177)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/SystemOutLogger.java 2010-08-16 11:04:19 UTC (rev 24178)
@@ -1,14 +1,14 @@
package org.jboss.tools.usage.test;
-import org.jboss.tools.usage.jgoogleanalytics.ILoggingAdapter;
+import org.jboss.tools.usage.googleanalytics.ILoggingAdapter;
public class SystemOutLogger implements ILoggingAdapter {
public void logError(String errorMessage) {
- System.out.println("errorMessage = " + errorMessage);
+ System.out.println("[DEBUG]: " + errorMessage);
}
public void logMessage(String message) {
- System.out.println("message = " + message);
+ System.out.println("[ERROR]" + message);
}
}
Added: 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 (rev 0)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageTestSuite.java 2010-08-16 11:04:19 UTC (rev 24178)
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+(a)RunWith(Suite.class)
+(a)Suite.SuiteClasses( {
+ FocusPointTest.class,
+ GoogleAnalyticsUrlStrategyTest.class,
+ JBossToolsUsageRequestsTest.class,
+ JBossToolsUsageTest.class,
+ EclipseEnvironmenTest.class })
+public class UsageTestSuite {
+
+}
Property changes on: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageTestSuite.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 8 months
- 1
- 0
JBoss Tools SVN: r24177 - in trunk/usage/plugins/org.jboss.tools.usage: .settings and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-08-16 07:01:36 -0400 (Mon, 16 Aug 2010)
New Revision: 24177
Added:
trunk/usage/plugins/org.jboss.tools.usage/.settings/net.sf.jautodoc.prefs
Modified:
trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch
trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF
Log:
[JBIDE-6376] user agent string corrected, tests added
Added: trunk/usage/plugins/org.jboss.tools.usage/.settings/net.sf.jautodoc.prefs
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/.settings/net.sf.jautodoc.prefs (rev 0)
+++ trunk/usage/plugins/org.jboss.tools.usage/.settings/net.sf.jautodoc.prefs 2010-08-16 11:01:36 UTC (rev 24177)
@@ -0,0 +1,7 @@
+#Thu Aug 12 14:50:29 CEST 2010
+add_header=true
+eclipse.preferences.version=1
+header_text=/*******************************************************************************\n * Copyright (c) 2008 Red Hat, Inc.\n * Distributed under license by Red Hat, Inc. All rights reserved.\n * This program is made available under the terms of the\n * Eclipse Public License v1.0 which accompanies this distribution,\n * and is available at http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n * Red Hat, Inc. - initial API and implementation\n ******************************************************************************/
+project_specific_settings=true
+replace_header=true
+replacements=<?xml version\="1.0" standalone\="yes"?>\n\n<replacements>\n<replacement key\="get" scope\="1" mode\="0">Gets the</replacement>\n<replacement key\="set" scope\="1" mode\="0">Sets the</replacement>\n<replacement key\="add" scope\="1" mode\="0">Adds the</replacement>\n<replacement key\="edit" scope\="1" mode\="0">Edits the</replacement>\n<replacement key\="remove" scope\="1" mode\="0">Removes the</replacement>\n<replacement key\="init" scope\="1" mode\="0">Inits the</replacement>\n<replacement key\="parse" scope\="1" mode\="0">Parses the</replacement>\n<replacement key\="create" scope\="1" mode\="0">Creates the</replacement>\n<replacement key\="build" scope\="1" mode\="0">Builds the</replacement>\n<replacement key\="is" scope\="1" mode\="0">Checks if is</replacement>\n<replacement key\="print" scope\="1" mode\="0">Prints the</replacement>\n<replacement key\="has" scope\="1" mode\="0">Checks for</replacement>\n</replacements>\n\n
Property changes on: trunk/usage/plugins/org.jboss.tools.usage/.settings/net.sf.jautodoc.prefs
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch 2010-08-16 10:57:43 UTC (rev 24176)
+++ trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch 2010-08-16 11:01:36 UTC (rev 24177)
@@ -11,24 +11,25 @@
<booleanAttribute key="clearwslog" value="false"/>
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/JBoss Usage Reporter"/>
<booleanAttribute key="default" value="false"/>
-<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.usage.analytics.javascript.test,org.jboss.tools.usage.analytics.javascript,org.jboss.tools.usage.test"/>
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="${workspace_loc}/../runtime-EclipseApplication"/>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6.0"/>
<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.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<booleanAttribute key="pde.generated.config" value="false"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="com.jboss.jbds.product.product"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.transforms.hook@default:false,org.eclipse.ecf@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.jface.databinding@default:default,com.springsource.javax.el@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.core.resources.compatibility@default:false,org.eclipse.help.base@default:default,org.apache.ant@default:default,org.eclipse.core.jobs@default:default,org.eclipse.swt@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.core.resources@default:default,org.eclipse.equinox.security@default:default,org.eclipse.core.filesystem.linux.x86@default:false,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.core.expressions@d!
efault:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.net@default:default,org.eclipse.ui.ide@default:default,org.eclipse.help@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.ui.forms@default:default,org.eclipse.core.filesystem@default:default,com.springsource.javax.servlet.jsp@default:default,org.hamcrest.core@default:default,com.springsource.javax.servlet@default:default,org.eclipse.ecf.identity@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.swt.gtk.linux.x86@default:false,org.eclipse.ui.navigator.resources@default:default,org.eclipse.text@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.app@default:default,org.mortbay.jetty.server@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ant.core@default:default,org.eclipse.ui@default:default,org.eclipse.core.runtime@default:t!
rue,org.eclipse.core.net.linux.x86@default:false,org.eclipse.c!
ore.comm
ands@default:default,org.eclipse.equinox.common@2:true,org.apache.commons.el@default:default,javax.transaction@default:false,org.eclipse.equinox.p2.engine@default:default,org.eclipse.jface@default:default,org.eclipse.ecf.filetransfer@default:default,org.apache.jasper@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.help.ui@default:default,com.springsource.org.apache.commons.logging@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.core.databinding@default:default,org.eclipse.osgi.services@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.ecf.provider.filetransfer@default:default,com.ibm.icu@default:default,org.eclipse.ui.cheatsheets@default:default,com.jboss.jbds.product@default:default,org.eclipse.osgi@-1:true,org.eclipse.compare.core@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.core.databinding.property@default:default,org!
.eclipse.core.variables@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.apache.lucene@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui.views@default:default,javax.servlet@default:default,org.apache.lucene.analysis@default:default,org.junit4@default:default,org.mortbay.jetty.util@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.jface.text@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage.analytics@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.osgi@-1:true,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.junit4@default:default,org.hamcrest.core@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.jface.databinding@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.equinox.registry@default:default,org.eclipse.jface@default:default,org.eclipse.equinox.common@2:true,com.ibm.icu@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.help@default:default,org.eclipse.core.expressions@default:default,org.eclipse.swt@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.core.contenttype@default:default,org.eclipse!
.swt.cocoa.macosx.x86_64@default:false,org.eclipse.core.commands@default:default,javax.servlet@default:default,org.eclipse.osgi.services@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.jobs@default:default,org.eclipse.ui@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage@default:default,org.jboss.tools.usage.test@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
<booleanAttribute key="useDefaultConfig" value="true"/>
<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useProduct" value="true"/>
+<booleanAttribute key="useProduct" value="false"/>
<booleanAttribute key="usefeatures" value="false"/>
</launchConfiguration>
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-16 10:57:43 UTC (rev 24176)
+++ trunk/usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF 2010-08-16 11:01:36 UTC (rev 24177)
@@ -5,10 +5,12 @@
Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.jboss.tools.usage,
- org.jboss.tools.usage.jgoogleanalytics,
+ org.jboss.tools.usage.googleanalytics,
+ org.jboss.tools.usage.internal;x-friends:="org.jboss.tools.usage.test",
+ org.jboss.tools.usage.preferences,
org.jboss.tools.usage.util
-Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.osgi;bundle-version="3.5.2",
- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)"
+Require-Bundle: org.eclipse.osgi;bundle-version="3.5.0",
+ org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.ui;bundle-version="3.5.0"
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.jboss.tools.usage.internal.JBossToolsUsageActivator
15 years, 8 months
- 1
- 0