JBoss Tools SVN: r24216 - trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-08-17 10:46:11 -0400 (Tue, 17 Aug 2010)
New Revision: 24216
Modified:
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/NamespacePrefixesProvider.java
Log:
fix for complation error in maven build @Override removed
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-17 14:32:31 UTC (rev 24215)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/NamespacePrefixesProvider.java 2010-08-17 14:46:11 UTC (rev 24216)
@@ -151,7 +151,6 @@
// sort list alphabetically on prefix name
Collections.sort(list,new Comparator<Object>()
{
- @Override
public int compare(Object o1, Object o2) {
return ((NamespacePrefixElement)o1).prefix.compareTo(((NamespacePrefixElement)o2).prefix);
}
@@ -220,4 +219,4 @@
}
}
}
-}
\ No newline at end of file
+}
15 years, 8 months
- 1
- 0
JBoss Tools SVN: r24215 - in trunk/usage: plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-08-17 10:32:31 -0400 (Tue, 17 Aug 2010)
New Revision: 24215
Added:
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/JBossBundleGroups.java
Modified:
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/IGoogleAnalyticsParameters.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/Tracker.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/EclipseEnvironment.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/GoogleAnalyticsUrlStrategy.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/BundleUtils.java
trunk/usage/tests/org.jboss.tools.usage.test/GoogleAnalyticsUrlStrategyTest.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/JBossToolsUsageRequestsTest.java
Log:
[JBIDE-6376] partial bundle reporting implemented
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/IGoogleAnalyticsParameters.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/IGoogleAnalyticsParameters.java 2010-08-17 13:55:29 UTC (rev 24214)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/IGoogleAnalyticsParameters.java 2010-08-17 14:32:31 UTC (rev 24215)
@@ -53,8 +53,8 @@
public static final String PARAM_COOKIES_UTMCSR = "utmcsr";
public static final String PARAM_COOKIES_UTMCCN = "utmccn";
public static final String PARAM_COOKIES_UTMCMD = "utmcmd";
+ public static final String PARAM_COOKIES_KEYWORD = "utmctr";
-
public static final String VALUE_TRACKING_CODE_VERSION = "4.7.2";
public static final String VALUE_NO_REFERRAL = "-";
public static final String VALUE_ENCODING_UTF8 = "UTF-8";
@@ -77,5 +77,7 @@
public String getUserAgent();
public String getUserId();
+
+ public String getKeyword();
}
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/Tracker.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/Tracker.java 2010-08-17 13:55:29 UTC (rev 24214)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/Tracker.java 2010-08-17 14:32:31 UTC (rev 24215)
@@ -14,7 +14,6 @@
import java.text.MessageFormat;
import org.jboss.tools.usage.ITracker;
-import org.jboss.tools.usage.internal.GoogleAnalyticsUrlStrategy;
import org.jboss.tools.usage.internal.HttpGetMethod;
/**
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/EclipseEnvironment.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/EclipseEnvironment.java 2010-08-17 13:55:29 UTC (rev 24214)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/EclipseEnvironment.java 2010-08-17 14:32:31 UTC (rev 24215)
@@ -20,8 +20,10 @@
import org.eclipse.ui.PlatformUI;
import org.jboss.tools.usage.googleanalytics.IGoogleAnalyticsParameters;
import org.jboss.tools.usage.preferences.IUsageReportPreferenceConstants;
+import org.jboss.tools.usage.util.BundleUtils;
import org.jboss.tools.usage.util.PreferencesUtil;
import org.jboss.tools.usage.util.StatusUtils;
+import org.jboss.tools.usage.util.BundleUtils.IBundleEntryFilter;
import org.osgi.framework.Bundle;
import org.osgi.service.prefs.BackingStoreException;
import org.osgi.service.prefs.Preferences;
@@ -202,4 +204,26 @@
builder.append(System.currentTimeMillis());
return builder.toString();
}
+
+ @Override
+ public String getKeyword() {
+ JBossBundleGroups jbossBundleGroups = new JBossBundleGroups();
+ IBundleEntryFilter jbossToolsFilter = new BundleUtils.BundleSymbolicNameFilter("org\\.jboss\\.tools.+");
+ IBundleEntryFilter compositeFilter = new BundleUtils.CompositeFilter(
+ jbossToolsFilter
+ , jbossBundleGroups );
+ BundleUtils.getBundles(compositeFilter, JBossToolsUsageActivator.getDefault().getBundle().getBundleContext());
+
+ return bundleGroupsToKeywordString(jbossBundleGroups);
+ }
+
+ private String bundleGroupsToKeywordString(JBossBundleGroups jbossBundleGroups) {
+ char delimiter = '-';
+ StringBuilder builder = new StringBuilder();
+ for (String bundleGroupId : jbossBundleGroups.getBundleGroupIds()) {
+ builder.append(bundleGroupId)
+ .append(delimiter);
+ }
+ return builder.toString();
+ }
}
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/GoogleAnalyticsUrlStrategy.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/GoogleAnalyticsUrlStrategy.java 2010-08-17 13:55:29 UTC (rev 24214)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/GoogleAnalyticsUrlStrategy.java 2010-08-17 14:32:31 UTC (rev 24215)
@@ -127,14 +127,13 @@
appendParameter(IGoogleAnalyticsParameters.PARAM_PAGE_REQUEST, focusPoint.getContentURI(), builder);
appendParameter(IGoogleAnalyticsParameters.PARAM_ACCOUNT_NAME, googleParameters.getAccountName(), builder);
- appendCookies(focusPoint, builder);
- builder.append(IGoogleAnalyticsParameters.AMPERSAND);
+ appendParameter(IGoogleAnalyticsParameters.PARAM_COOKIES, getCookies(focusPoint, builder), builder);
appendParameter(IGoogleAnalyticsParameters.PARAM_GAQ, "1", false, builder);
return builder.toString();
}
- private void appendCookies(FocusPoint focusPoint, StringBuilder builder) {
+ private String getCookies(FocusPoint focusPoint, StringBuilder builder) {
long timeStamp = System.currentTimeMillis();
StringBuilder stringBuilder = new StringBuilder();
@@ -158,14 +157,12 @@
.append(IGoogleAnalyticsParameters.PARAM_COOKIES_UTMCCN).append(IGoogleAnalyticsParameters.EQUALS_SIGN)
.append("(direct)").append(IGoogleAnalyticsParameters.PIPE)
.append(IGoogleAnalyticsParameters.PARAM_COOKIES_UTMCMD).append(IGoogleAnalyticsParameters.EQUALS_SIGN)
- .append("(none)")
- .append(IGoogleAnalyticsParameters.SEMICOLON);
+ .append("(none)");
+ appendCookieKeyword(builder);
+ builder.append(IGoogleAnalyticsParameters.SEMICOLON);
- String encodedString = EncodingUtils.checkedEncodeUtf8(stringBuilder.toString());
+ return EncodingUtils.checkedEncodeUtf8(stringBuilder.toString());
- builder.append(IGoogleAnalyticsParameters.PARAM_COOKIES).append(IGoogleAnalyticsParameters.EQUALS_SIGN).append(
- encodedString);
-
// builder.append(IGoogleAnalyticsParameters.PARAM_COOKIE_VALUES)
// .append(IGoogleAnalyticsParameters.EQUALS_SIGN)
// .append("__utma%3D")
@@ -198,6 +195,21 @@
}
+ /**
+ * Appends the keyword to the cookies.
+ *
+ * @param builder the builder to append to
+ */
+ private void appendCookieKeyword(StringBuilder builder) {
+ String keyword = googleParameters.getKeyword();
+ if (keyword != null && keyword.length() > 0) {
+ builder.append(IGoogleAnalyticsParameters.PIPE)
+ .append(IGoogleAnalyticsParameters.PARAM_COOKIES_KEYWORD)
+ .append(IGoogleAnalyticsParameters.EQUALS_SIGN)
+ .append(keyword);
+ }
+ }
+
private String getRandomNumber() {
return Integer.toString((int) (Math.random() * 0x7fffffff));
}
Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/JBossBundleGroups.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/JBossBundleGroups.java (rev 0)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/JBossBundleGroups.java 2010-08-17 14:32:31 UTC (rev 24215)
@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * 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.internal;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.jboss.tools.usage.util.BundleUtils.IBundleEntryFilter;
+import org.osgi.framework.Bundle;
+
+public class JBossBundleGroups implements IBundleEntryFilter {
+
+ private static final String SEAM_ID = "seam";
+ private static final String SMOOKS_ID = "smooks";
+
+ private Set<String> jbossBundleGroups = new HashSet<String>();
+
+ @Override
+ public boolean matches(Bundle bundle) {
+ String bundleName = bundle.getSymbolicName();
+ if (isSmooks(bundleName)) {
+ addGroup(SMOOKS_ID);
+ } else if (isSeam(bundleName)) {
+ addGroup(SEAM_ID);
+ }
+ return false;
+ }
+
+ private void addGroup(String groupId) {
+ jbossBundleGroups.add(groupId);
+ }
+
+ private boolean isSeam(String bundleName) {
+ return "org.jboss.tools.seam.core".equals(bundleName)
+ | "org.jboss.tools.seam.doc.user".equals(bundleName)
+ | "org.jboss.tools.seam.pages.xml".equals(bundleName)
+ | "org.jboss.tools.seam.text.ext".equals(bundleName)
+ | "org.jboss.tools.seam.ui".equals(bundleName)
+ | "org.jboss.tools.seam.ui.pages".equals(bundleName)
+ | "org.jboss.tools.seam.xml".equals(bundleName)
+ | "org.jboss.tools.seam.xml.ui".equals(bundleName);
+ }
+
+ private boolean isSmooks(String bundleName) {
+ return "org.jboss.tools.smooks.core".equals(bundleName)
+ | "org.jboss.tools.smooks.runtime".equals(bundleName)
+ | "org.jboss.tools.smooks.templating".equals(bundleName)
+ | "org.jboss.tools.smooks.ui".equals(bundleName);
+ }
+
+ public Collection<String> getBundleGroupIds() {
+ return jbossBundleGroups;
+ }
+
+}
\ No newline at end of file
Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/JBossBundleGroups.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/BundleUtils.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/BundleUtils.java 2010-08-17 13:55:29 UTC (rev 24214)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/BundleUtils.java 2010-08-17 14:32:31 UTC (rev 24215)
@@ -86,7 +86,7 @@
* @param filters
* the filters
*/
- public CompositeFilter(IBundleEntryFilter[] filters) {
+ public CompositeFilter(IBundleEntryFilter... filters) {
this.filters = filters;
}
Modified: trunk/usage/tests/org.jboss.tools.usage.test/GoogleAnalyticsUrlStrategyTest.launch
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/GoogleAnalyticsUrlStrategyTest.launch 2010-08-17 13:55:29 UTC (rev 24214)
+++ trunk/usage/tests/org.jboss.tools.usage.test/GoogleAnalyticsUrlStrategyTest.launch 2010-08-17 14:32:31 UTC (rev 24215)
@@ -36,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.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.variables@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.osgi.services@default:default,org.eclipse.jface.text@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.equinox.transforms.hook@default:false,javax.transaction@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.swt.cocoa.macosx@default:false,org.eclipse.osgi,org.eclipse.equinox.concurrent@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.core.databinding.property@default:default,org.eclipse.core.resources.compatibility@default:false,org.ecl!
ipse.equinox.common@default:default,org.eclipse.core.commands@default:default,org.eclipse.ecf.identity@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.equinox.p2.repository@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.expressions@default:default,org.eclipse.jface@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.ui@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.swt@default:default,org.hamcrest.core@default:default,org.eclipse.core.net@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.junit4@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.help@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.core.databinding.observable@default:default,javax.servlet@default:default,org.eclipse.core.ru!
ntime@default:true,org.eclipse.equinox.p2.metadata.repository@!
default:
default,org.eclipse.equinox.security.macosx@default:false,org.eclipse.ui.forms@default:default,org.eclipse.text@default:default,org.eclipse.ui.views@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.equinox.security@default:default,org.eclipse.core.databinding@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.app@default:default,com.ibm.icu@default:default,org.eclipse.ecf@default:default,org.eclipse.ui.ide@default:default,org.eclipse.core.resources@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage@default:default,org.jboss.tools.usage.test@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.core.commands@default:default,org.eclipse.equinox.security.macosx@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.core.resources@default:default,com.ibm.icu@default:default,org.eclipse.equinox.common@2:true,org.eclipse.core.contenttype@default:default,org.jboss.tools.seam.ui@default:default,org.jboss.tools.smooks.runtime@default:default,org.eclipse.core.resources.compatibility@default:false,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.equinox.preferences@default:default,org.eclipse.osgi.services@default:default,org.eclipse.ecf@default:default,org.junit4@default:default,org.eclipse.ui@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.help@default:default,org.jboss.tools.seam.ui.pages@default:default,org.!
eclipse.swt.cocoa.macosx@default:false,org.eclipse.ui.cocoa@default:false,org.eclipse.core.runtime@default:true,javax.servlet@default:default,org.eclipse.core.net@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.equinox.app@default:default,org.jboss.tools.smooks.core@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.text@default:default,org.eclipse.ui.ide@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.jface@default:default,org.eclipse.swt@default:default,javax.transaction@default:false,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.core.jobs@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.equinox.p2.metadata@de!
fault:default,org.eclipse.jface.text@default:default,org.eclip!
se.core.
databinding.observable@default:default,org.eclipse.ui.forms@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.filesystem.macosx@default:false,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.equinox.p2.engine@default:default,org.eclipse.ui.views@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.core.variables@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.p2.repository@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"/>
Modified: trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageTest.launch
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageTest.launch 2010-08-17 13:55:29 UTC (rev 24214)
+++ trunk/usage/tests/org.jboss.tools.usage.test/JBossToolsUsageTest.launch 2010-08-17 14:32:31 UTC (rev 24215)
@@ -36,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.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"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.core.commands@default:default,org.eclipse.equinox.security.macosx@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.core.resources@default:default,org.jboss.tools.seam.xml@default:default,com.ibm.icu@default:default,org.eclipse.equinox.common@2:true,org.eclipse.core.contenttype@default:default,org.jboss.tools.seam.ui@default:default,org.jboss.tools.seam.xml.ui@default:default,org.jboss.tools.smooks.runtime@default:default,org.eclipse.core.resources.compatibility@default:false,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.equinox.preferences@default:default,org.eclipse.osgi.services@default:default,org.eclipse.ecf@default:default,org.junit4@default:default,org.eclipse.ui@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.runtime.compatibility.registry@default:fals!
e,org.eclipse.help@default:default,org.jboss.tools.seam.ui.pages@default:default,org.eclipse.swt.cocoa.macosx@default:false,org.eclipse.ui.cocoa@default:false,org.eclipse.core.runtime@default:true,javax.servlet@default:default,org.eclipse.core.net@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.equinox.app@default:default,org.jboss.tools.seam.text.ext@default:default,org.jboss.tools.smooks.core@default:default,org.eclipse.equinox.registry@default:default,org.jboss.tools.jsf.vpe.seam@default:default,org.eclipse.text@default:default,org.eclipse.ui.ide@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.core.databinding@default:default,org.jboss.tools.seam.pages.xml@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.jface@default:default,org.jboss.t!
ools.seam.core@default:default,org.eclipse.swt@default:default!
,javax.t
ransaction@default:false,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.core.jobs@default:default,org.jboss.tools.smooks.templating@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.jface.text@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.ui.forms@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.filesystem.macosx@default:false,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.equinox.p2.engine@default:default,org.eclipse.ui.views@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.core.variables@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.p!
2.repository@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"/>
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-17 13:55:29 UTC (rev 24214)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-08-17 14:32:31 UTC (rev 24215)
@@ -576,8 +576,8 @@
+"__utmz%3D156030500.1281430767.1.1."
+"utmcsr%3D(direct)%7C"
+"utmccn%3D(direct)%7C"
- +"utmcmd%3D(none)%3D%7C"
- +"utmctr%3Dtest1%7Ctest2%7Ctest3%7Ctest4%7Ctest5%7Ctest6%7Ctest7%7Ctest8%7Ctest8%7Ctest9%7Ctest10%7Ctest11%7Ctest12%7Ctest13%7Ctest514%7Ctest14%7Ctest15%7Ctest16%7Ctest17%7Ctest18%7Ctest19%7Ctest20%7Ctest20%7Ctest21%7Ctest22%7Ctest23%7Ctest514%7Ctest24%7Ctest25%7Ctest26%7Ctest27%7Ctest28%7Ctest29%7Ctest30%3B"
+ +"utmcmd%3D(none)%7C"
+ +"utmctr%3Dtest1%7Ctest2%7Ctest3%7Ctest4%7Ctest5%7Ctest6%7Ctest7%7Ctest8%7Ctest8%7Ctest9%7Ctest10%7Ctest11%7Ctest12%7Ctest13%7Ctest514%7Ctest14%7Ctest15%7Ctest16%7Ctest17%7Ctest18%7Ctest19%7Ctest20%7Ctest20%7Ctest21%7Ctest22%7Ctest23%7Ctest514%7Ctest24%7Ctest25%7Ctest26%7Ctest27%7Ctest28%7Ctest29%7Ctest30%7Ctest31%3B"
+"&gaq=1";
method.request(url);
assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
15 years, 8 months
- 1
- 0
JBoss Tools SVN: r24214 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2010-08-17 09:55:29 -0400 (Tue, 17 Aug 2010)
New Revision: 24214
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEntityImpl.java
Log:
https://jira.jboss.org/browse/JBIDE-6852
remove second infinite loop
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEntityImpl.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEntityImpl.java 2010-08-17 13:33:33 UTC (rev 24213)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEntityImpl.java 2010-08-17 13:55:29 UTC (rev 24214)
@@ -304,8 +304,9 @@
if (result != null) {
return result;
}
- while (getGeneratorContainer().genericGenerators().hasNext()) {
- result = getGeneratorContainer().genericGenerators().next()
+ ListIterator<JavaGenericGenerator> genericGenerators = getGeneratorContainer().genericGenerators();
+ while (genericGenerators.hasNext()) {
+ result = genericGenerators.next()
.javaCompletionProposals(pos, filter, astRoot);
if (result != null) {
return result;
15 years, 8 months
- 1
- 0
JBoss Tools SVN: r24213 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2010-08-17 09:33:33 -0400 (Tue, 17 Aug 2010)
New Revision: 24213
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEntityImpl.java
Log:
https://jira.jboss.org/browse/JBIDE-6852
remove infinite loop
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEntityImpl.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEntityImpl.java 2010-08-17 12:50:38 UTC (rev 24212)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEntityImpl.java 2010-08-17 13:33:33 UTC (rev 24213)
@@ -12,6 +12,7 @@
import java.util.Iterator;
import java.util.List;
+import java.util.ListIterator;
import org.eclipse.jdt.core.dom.CompilationUnit;
import org.eclipse.jpt.core.context.BaseJoinColumn;
@@ -263,13 +264,14 @@
@Override
public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) {
super.validate(messages, reporter, astRoot);
- validateGenericGenerator(messages, reporter, astRoot);
+ this.validateGenericGenerator(messages, reporter, astRoot);
this.validateForeignKey(messages, astRoot);
}
protected void validateGenericGenerator(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) {
- while (getGeneratorContainer().genericGenerators().hasNext()) {
- getGeneratorContainer().genericGenerators().next().validate(messages, reporter, astRoot);
+ ListIterator<JavaGenericGenerator> genericGenerators = getGeneratorContainer().genericGenerators();
+ while (genericGenerators.hasNext()) {
+ genericGenerators.next().validate(messages, reporter, astRoot);
}
}
15 years, 8 months
- 1
- 0
JBoss Tools SVN: r24212 - trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-08-17 08:50:38 -0400 (Tue, 17 Aug 2010)
New Revision: 24212
Modified:
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java
Log:
[JBIDE-6376] test request corrected
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-17 12:46:48 UTC (rev 24211)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-08-17 12:50:38 UTC (rev 24212)
@@ -561,21 +561,18 @@
TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter);
String url = "http://www.google-analytics.com/__utm.gif?"
+"utmwv=4.7.2"
- +"&utmn=351334444"
+ +"&utmn=351334794"
+"&utmhn=jboss.org"
+"&utmcs=UTF-8"
+"&utmsr=1920x1080"
+"&utmsc=24-bit"
+"&utmul=en-us"
- +"&utmdt=tools-usage-test_0_7_3_win__utmctr"
+ +"&utmdt=tools-usage-test_0_7_3_win_lengthtest"
+"&utmhid=1087431432"
- +"&utmr=seam|esb|smooks|birt|bpel|cdi|deltacloud|drools"
- +"&utm_content=test1%7Ctest2%7Ctest3"
- +"&utmp=%2Ftools%2Fusage%2FtestUrl0_7_3_win_utctr"
+ +"&utmp=%2Ftools%2Fusage%2FtestUrl0_7_3_win_lengthtest"
+"&utmac=UA-17645367-1"
- +"&utmz=test1%7Ctest2%7Ctest3"
+"&utmcc="
- +"__utma%3D133663892.1285760711.1281430767.1281430767.1281430767.1%3B%2B"
+ +"__utma%3D133697892.1285760711.1281430767.1281430767.1281430767.1%3B%2B"
+"__utmz%3D156030500.1281430767.1.1."
+"utmcsr%3D(direct)%7C"
+"utmccn%3D(direct)%7C"
15 years, 8 months
- 1
- 0
JBoss Tools SVN: r24211 - in trunk/usage: plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-08-17 08:46:48 -0400 (Tue, 17 Aug 2010)
New Revision: 24211
Modified:
trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/Tracker.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/UsageReport.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/UsageReportDispatcher.java
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageTest.java
Log:
[JBIDE-6376] classes refactored: clean separation of tracking code / google analytics specific code
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-17 12:45:32 UTC (rev 24210)
+++ trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch 2010-08-17 12:46:48 UTC (rev 24211)
@@ -24,13 +24,13 @@
<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.security@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.jface@default:default,org.eclipse.swt.cocoa.macosx@default:false,org.eclipse.osgi,org.eclipse.ui.workbench@default:default,org.eclipse.core.databinding@default:default,org.eclipse.equinox.common@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.core.runtime@default:true,org.eclipse.ui@default:default,org.eclipse.jface.text@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,javax.transaction@default:false,org.eclipse.core.contenttype@default:default,javax.servlet@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,com.ibm.icu@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.resources@default:default,org.eclipse.equinox.!
p2.metadata.repository@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.core.commands@default:default,org.eclipse.ant.core@default:default,org.junit4@default:default,org.eclipse.core.net@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.core.resources.compatibility@default:false,org.eclipse.equinox.concurrent@default:default,org.eclipse.ecf@default:default,org.eclipse.text@default:default,org.hamcrest.core@default:default,org.eclipse.core.variables@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.swt@default:default,org.eclipse.osgi.services@default:default,org.eclipse.equinox.app@default:default,org.eclipse.ui.ide@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.help@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.j!
face.databinding@default:default,org.eclipse.equinox.transform!
s.hook@d
efault:false,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.ecf.filetransfer@default:default,org.eclipse.equinox.security.macosx@default:false,org.eclipse.equinox.p2.repository@default:default,org.eclipse.core.jobs@default:default,org.eclipse.ui.forms@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.ui.views@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.runtime.compatibility.registry@default:false"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.core.commands@default:default,org.eclipse.equinox.security.macosx@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.core.resources@default:default,com.ibm.icu@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.common@2:true,org.eclipse.core.contenttype@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.core.resources.compatibility@default:false,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.mortbay.jetty.server@default:default,org.eclipse.help.base@default:default,org.apache.ant@default:default,com.springsource.javax.el@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.osgi.services@default:default,org.eclipse.ecf@default:default,com.springsource.javax.servlet.jsp@default:de!
fault,org.junit4@default:default,org.eclipse.ui@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.help@default:default,org.eclipse.swt.cocoa.macosx@default:false,org.eclipse.ui.cocoa@default:false,org.eclipse.core.runtime@default:true,com.springsource.javax.servlet@default:default,org.eclipse.ui.intro.universal@default:default,javax.servlet@default:default,org.eclipse.core.net@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.text@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.dat!
abinding.property@default:default,org.eclipse.equinox.p2.metad!
ata.repo
sitory@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.jface@default:default,org.apache.lucene@default:default,org.eclipse.swt@default:default,javax.transaction@default:false,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.core.jobs@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.jface.text@default:default,org.apache.jasper@default:default,org.apache.commons.el@default:default,org.eclipse.help.ui@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.ui.forms@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.filesystem.macosx@default:false,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.equinox.p2.engine@default:default,com.springsource.org.apache.c!
ommons.logging@default:default,org.eclipse.ui.views@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.core.variables@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,com.jboss.jbds.product@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.transforms.hook@default:false,org.apache.lucene.analysis@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.compare.core@default:default,org.mortbay.jetty.util@default:default,org.eclipse.equinox.p2.repository@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"/>
+<booleanAttribute key="useProduct" value="true"/>
<booleanAttribute key="usefeatures" value="false"/>
</launchConfiguration>
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/Tracker.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/Tracker.java 2010-08-17 12:45:32 UTC (rev 24210)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/Tracker.java 2010-08-17 12:46:48 UTC (rev 24211)
@@ -30,10 +30,10 @@
private HttpGetMethod httpRequest;
private ILoggingAdapter loggingAdapter;
- public Tracker(IGoogleAnalyticsParameters googleParameters, ILoggingAdapter loggingAdapter) {
- this.httpRequest = new HttpGetMethod(googleParameters.getUserAgent(), loggingAdapter);
+ public Tracker(IURLBuildingStrategy urlBuildingStrategy, String userAgent, ILoggingAdapter loggingAdapter) {
+ this.httpRequest = new HttpGetMethod(userAgent, loggingAdapter);
this.loggingAdapter = loggingAdapter;
- this.urlBuildingStrategy = new GoogleAnalyticsUrlStrategy(googleParameters);
+ this.urlBuildingStrategy = urlBuildingStrategy;
}
public void trackSynchronously(FocusPoint focusPoint) throws UnsupportedEncodingException {
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/UsageReport.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/UsageReport.java 2010-08-17 12:45:32 UTC (rev 24210)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/UsageReport.java 2010-08-17 12:46:48 UTC (rev 24211)
@@ -19,6 +19,7 @@
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.IURLBuildingStrategy;
import org.jboss.tools.usage.googleanalytics.Tracker;
import org.jboss.tools.usage.preferences.IUsageReportPreferenceConstants;
import org.jboss.tools.usage.util.StatusUtils;
@@ -26,7 +27,7 @@
public class UsageReport {
- private static final String GANALYTICS_TRACKINGCODE = "UA-17645367-1";
+ private static final String GANALYTICS_ACCOUNTNAME = "UA-17645367-1";
private static final String HOST_NAME = "jboss.org";
@@ -68,12 +69,12 @@
private ITracker getAnalyticsTracker() {
IGoogleAnalyticsParameters eclipseSettings = new EclipseEnvironment(
- GANALYTICS_TRACKINGCODE
+ GANALYTICS_ACCOUNTNAME
, HOST_NAME
, IGoogleAnalyticsParameters.VALUE_NO_REFERRAL);
ILoggingAdapter loggingAdapter = new PluginLogger(JBossToolsUsageActivator.getDefault());
- Tracker tracker = new Tracker(eclipseSettings, loggingAdapter);
- return tracker;
+ IURLBuildingStrategy urlStrategy = new GoogleAnalyticsUrlStrategy(eclipseSettings);
+ return new Tracker(urlStrategy, eclipseSettings.getUserAgent(), loggingAdapter);
}
private boolean isAskUser() {
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/UsageReportDispatcher.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/UsageReportDispatcher.java 2010-08-17 12:45:32 UTC (rev 24210)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/UsageReportDispatcher.java 2010-08-17 12:46:48 UTC (rev 24211)
@@ -12,7 +12,6 @@
import org.eclipse.ui.IStartup;
/**
- *
* @author Andre Dieitsheim
*/
public class UsageReportDispatcher implements IStartup {
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-17 12:45:32 UTC (rev 24210)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageTest.java 2010-08-17 12:46:48 UTC (rev 24211)
@@ -15,7 +15,9 @@
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.IURLBuildingStrategy;
import org.jboss.tools.usage.googleanalytics.Tracker;
+import org.jboss.tools.usage.internal.GoogleAnalyticsUrlStrategy;
import org.jboss.tools.usage.internal.PluginLogger;
import org.jboss.tools.usage.test.internal.JBossToolsUsageTestActivator;
import org.junit.Test;
@@ -49,6 +51,7 @@
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);
+ IURLBuildingStrategy urlStrategy = new GoogleAnalyticsUrlStrategy(eclipseSettings);
+ return new Tracker(urlStrategy, eclipseSettings.getUserAgent(), loggingAdapter);
}
}
15 years, 8 months
- 1
- 0
JBoss Tools SVN: r24210 - trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-08-17 08:45:32 -0400 (Tue, 17 Aug 2010)
New Revision: 24210
Modified:
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java
Log:
[JBIDE-6376] further tests to find a parameter to report plugins to
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-17 12:20:36 UTC (rev 24209)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-08-17 12:45:32 UTC (rev 24210)
@@ -1,3 +1,12 @@
+ /*******************************************************************************
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.usage.test;
import static org.junit.Assert.assertEquals;
@@ -8,6 +17,7 @@
import org.jboss.tools.usage.googleanalytics.ILoggingAdapter;
import org.jboss.tools.usage.internal.HttpGetMethod;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
public class JBossToolsUsageRequestsTest {
@@ -19,6 +29,7 @@
this.loggingAdapter = new SystemOutLogger();
}
+ @Ignore
@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";
@@ -44,6 +55,7 @@
assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
}
+ @Ignore
@Test
public void testUrl0_0() throws IOException {
String userAgent = "com.jboss.jbds.product/3.0.1 (X11; U; Linux x86_64; en-US)";
@@ -69,6 +81,7 @@
assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
}
+ @Ignore
@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";
@@ -94,6 +107,7 @@
assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
}
+ @Ignore
@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";
@@ -119,6 +133,7 @@
assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
}
+ @Ignore
@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";
@@ -143,7 +158,8 @@
method.request(url);
assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
}
-
+
+ @Ignore
@Test
public void testUrl0_4() throws IOException {
String userAgent = "com.jboss.jbds.product/3.0.1";
@@ -169,6 +185,7 @@
assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
}
+ @Ignore
@Test
public void testUrl0_5() throws IOException {
String userAgent = "com.jboss.jbds.product/3.0.1 (Linux x86_64)";
@@ -194,6 +211,7 @@
assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
}
+ @Ignore
@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";
@@ -219,6 +237,7 @@
assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
}
+ @Ignore
@Test
public void testUrl0_7() throws IOException {
String userAgent = "com.jboss.jbds.product/3.0.1 (X11; U; Linux x86_64; en-US)";
@@ -244,6 +263,7 @@
assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
}
+ @Ignore
@Test
public void testUrl0_7_1() throws IOException {
String userAgent = "com.jboss.jbds.product/3.0.1 (X11; U; Linux x86_64; en-us)";
@@ -267,8 +287,8 @@
method.request(url);
assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
}
-
+ @Ignore
@Test
public void testUrl0_7_2() throws IOException {
String userAgent = "com.jboss.jbds.product/3.0.1 (X11; U; Linux x86_64; en-US)";
@@ -292,6 +312,7 @@
assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
}
+ @Ignore
@Test
public void testUrl0_7_3() throws IOException {
String userAgent = "com.jboss.jbds.product/3.0.1 (X11; U; Linux x86_64; en-US)";
@@ -315,6 +336,7 @@
assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
}
+ @Ignore
@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)";
@@ -338,6 +360,7 @@
assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
}
+ @Ignore
@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)";
@@ -385,6 +408,7 @@
assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
}
+ @Ignore
@Test
public void testUrl8() throws IOException {
String userAgent = "com.jboss.jbds.product/3.0.1 (Windows; U; Windows NT 6.1; en-US)";
@@ -409,7 +433,7 @@
}
@Test
- public void testUrl0_7_3_win_1() throws IOException {
+ public void testUrl0_7_3_win_referral() 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?"
@@ -420,17 +444,148 @@
+"&utmsr=1920x1080"
+"&utmsc=24-bit"
+"&utmul=en-us"
- +"&utmdt=tools-usage-test_0_7_3_win_1"
+ +"&utmdt=tools-usage-test_0_7_3_win_referral"
+"&utmhid=1087431432"
+"&utmr=seam|esb|smooks|birt|bpel|cdi|deltacloud|drools"
- +"&utmp=%2Ftools%2Fusage%2FtestUrl0_7_3_win_1"
+ +"&utm_content=test1%7Ctest2%7Ctest3"
+ +"&utmp=%2Ftools%2Fusage%2FtestUrl0_7_3_win_referral"
+"&utmac=UA-17645367-1"
+"&utmcc=__utma%3D133663892.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_adcontent() 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=378334444"
+ +"&utmhn=jboss.org"
+ +"&utmcs=UTF-8"
+ +"&utmsr=1920x1080"
+ +"&utmsc=24-bit"
+ +"&utmul=en-us"
+ +"&utmdt=tools-usage-test_0_7_3_win_adcontent"
+ +"&utmhid=1087431432"
+ +"&utmr=seam|esb|smooks|birt|bpel|cdi|deltacloud|drools"
+ +"&utm_content=test1%7Ctest2%7Ctest3%7test4"
+ +"&utmp=%2Ftools%2Fusage%2FtestUrl0_7_3_win_adcontent"
+ +"&utmac=UA-17645367-1"
+ +"&utmcc=__utma%3D455663892.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_keyword() 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=378334354"
+ +"&utmhn=jboss.org"
+ +"&utmcs=UTF-8"
+ +"&utmsr=1920x1080"
+ +"&utmsc=24-bit"
+ +"&utmul=en-us"
+ +"&utmdt=tools-usage-test_0_7_3_win_keyword"
+ +"&utmhid=1087431432"
+ +"&utmr=seam|esb|smooks|birt|bpel|cdi|deltacloud|drools"
+ +"&term=test1%7Ctest2%7Ctest3%7test4"
+ +"&utm_term=test1a%7Ctest2a%7Ctest3a%7test4a"
+ +"&utmp=%2Ftools%2Fusage%2FtestUrl0_7_3_win_keyword"
+ +"&utmac=UA-17645367-1"
+ +"&utmcc=__utma%3D887463892.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_utmz() 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=351334444"
+ +"&utmhn=jboss.org"
+ +"&utmcs=UTF-8"
+ +"&utmsr=1920x1080"
+ +"&utmsc=24-bit"
+ +"&utmul=en-us"
+ +"&utmdt=tools-usage-test_0_7_3_win__utmz"
+ +"&utmhid=1087431432"
+ +"&utmr=seam|esb|smooks|birt|bpel|cdi|deltacloud|drools"
+ +"&utm_content=test1%7Ctest2%7Ctest3"
+ +"&utmp=%2Ftools%2Fusage%2FtestUrl0_7_3_win__utmz"
+ +"&utmac=UA-17645367-1"
+ +"&utmz=test1%7Ctest2%7Ctest3"
+ +"&utmcc=__utma%3D133663892.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_utmctr() 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=351334444"
+ +"&utmhn=jboss.org"
+ +"&utmcs=UTF-8"
+ +"&utmsr=1920x1080"
+ +"&utmsc=24-bit"
+ +"&utmul=en-us"
+ +"&utmdt=tools-usage-test_0_7_3_win__utmctr"
+ +"&utmhid=1087431432"
+ +"&utmr=seam|esb|smooks|birt|bpel|cdi|deltacloud|drools"
+ +"&utm_content=test1%7Ctest2%7Ctest3"
+ +"&utmp=%2Ftools%2Fusage%2FtestUrl0_7_3_win_utctr"
+ +"&utmac=UA-17645367-1"
+ +"&utmz=test1%7Ctest2%7Ctest3"
+ +"&utmcc=__utma%3D133663892.1285760711.1281430767.1281430767.1281430767.1%3B%2B__utmz%3D156030500.1281430767.1.1.utmcsr%3D(direct)%7Cutmccn%3D(direct)%7Cutmcmd%3D(none)%3D%7Cutmctr%3Dtest1%7Ctest2%7Ctest3%3B"
+ +"&gaq=1";
+ method.request(url);
+ assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
+ }
+
+ @Test
+ public void testUrl0_7_3_win_utmctr_lengthtest() 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=351334444"
+ +"&utmhn=jboss.org"
+ +"&utmcs=UTF-8"
+ +"&utmsr=1920x1080"
+ +"&utmsc=24-bit"
+ +"&utmul=en-us"
+ +"&utmdt=tools-usage-test_0_7_3_win__utmctr"
+ +"&utmhid=1087431432"
+ +"&utmr=seam|esb|smooks|birt|bpel|cdi|deltacloud|drools"
+ +"&utm_content=test1%7Ctest2%7Ctest3"
+ +"&utmp=%2Ftools%2Fusage%2FtestUrl0_7_3_win_utctr"
+ +"&utmac=UA-17645367-1"
+ +"&utmz=test1%7Ctest2%7Ctest3"
+ +"&utmcc="
+ +"__utma%3D133663892.1285760711.1281430767.1281430767.1281430767.1%3B%2B"
+ +"__utmz%3D156030500.1281430767.1.1."
+ +"utmcsr%3D(direct)%7C"
+ +"utmccn%3D(direct)%7C"
+ +"utmcmd%3D(none)%3D%7C"
+ +"utmctr%3Dtest1%7Ctest2%7Ctest3%7Ctest4%7Ctest5%7Ctest6%7Ctest7%7Ctest8%7Ctest8%7Ctest9%7Ctest10%7Ctest11%7Ctest12%7Ctest13%7Ctest514%7Ctest14%7Ctest15%7Ctest16%7Ctest17%7Ctest18%7Ctest19%7Ctest20%7Ctest20%7Ctest21%7Ctest22%7Ctest23%7Ctest514%7Ctest24%7Ctest25%7Ctest26%7Ctest27%7Ctest28%7Ctest29%7Ctest30%3B"
+ +"&gaq=1";
+ method.request(url);
+ assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode());
+ }
+
protected class TestHttpGetMethod extends HttpGetMethod {
private HttpURLConnection urlConnection;
15 years, 8 months
- 1
- 0
JBoss Tools SVN: r24209 - trunk/jst/plugins/org.jboss.tools.jst.web.ui/templates.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2010-08-17 08:20:36 -0400 (Tue, 17 Aug 2010)
New Revision: 24209
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/templates/xhtmldefault-templates.properties
trunk/jst/plugins/org.jboss.tools.jst.web.ui/templates/xhtmldefault-templates.xml
Log:
https://jira.jboss.org/browse/JBIDE-6815, https://jira.jboss.org/browse/JBIDE-6816
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/templates/xhtmldefault-templates.properties
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/templates/xhtmldefault-templates.properties 2010-08-17 10:01:12 UTC (rev 24208)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/templates/xhtmldefault-templates.properties 2010-08-17 12:20:36 UTC (rev 24209)
@@ -13,3 +13,11 @@
Templates.xhtml.jsf2.composite.component = JSF Composite Component
Templates.xhtml.jsf2.composite.component.desc = New JSF Composite Component Template
Templates.xhtml.jsf2.composite.component.content = <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"\n"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\n<html xmlns="http://www.w3.org/1999/xhtml"\nxmlns:h="http://java.sun.com/jsf/html"\nxmlns:f="http://java.sun.com/jsf/core"\nxmlns:ui="http://java.sun.com/jsf/facelets"\nxmlns:composite="http://java.sun.com/jsf/composite">\n<head>\n<title>Not present in rendered output</title>\n</head>\n<body>\n<composite:interface>\n\n</composite:interface>\n<composite:implementation>\n\n</composite:implementation>\n</body>\n</html>
+
+Templates.xhtml.jsf = Blank JSF Page
+Templates.xhtml.jsf.desc = Simple JSF page without facelets
+Templates.xhtml.jsf.content = <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> \n<html xmlns="http://www.w3.org/1999/xhtml" \n xmlns:h="http://java.sun.com/jsf/html" \n xmlns:f="http://java.sun.com/jsf/core" \n xmlns:ui="http://java.sun.com/jsf/facelets"> \n\n<h:head></h:head> \n<body> \n\n</body> \n</html>\n
+
+Templates.xhtml.jsf.richfaces = Blank RichFaces Page
+Templates.xhtml.jsf.richfaces.desc = Simple RichFaces Page
+Templates.xhtml.jsf.richfaces.content = <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> \n<html xmlns="http://www.w3.org/1999/xhtml" \n xmlns:h="http://java.sun.com/jsf/html" \n xmlns:f="http://java.sun.com/jsf/core" \n xmlns:ui="http://java.sun.com/jsf/facelets" \n xmlns:a4j="http://richfaces.org/a4j" \n xmlns:rich="http://richfaces.org/rich"> \n\n<h:head></h:head> \n<body>\n <rich:panel>\n <f:facet name="header">\n Write your own custom rich components with built-in AJAX support\n </f:facet>\n <h:outputText value="Panel Body" /> \n <rich:panel>\n</body> \n</html>\n
\ No newline at end of file
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/templates/xhtmldefault-templates.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/templates/xhtmldefault-templates.xml 2010-08-17 10:01:12 UTC (rev 24208)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/templates/xhtmldefault-templates.xml 2010-08-17 12:20:36 UTC (rev 24209)
@@ -9,4 +9,8 @@
<template name="%Templates.xhtml.jsf2.composite.component" description="%Templates.xhtml.jsf2.composite.component.desc" id="org.jboss.tools.jsf.ui.xhtml.jsf2.composite.component" context="xhtml_new" enabled="true">%Templates.xhtml.jsf2.composite.component.content</template>
+<template name="%Templates.xhtml.jsf" description="%Templates.xhtml.jsf.desc" id="org.jboss.tools.jsf.ui.xhtml.component" context="xhtml_new" enabled="true">%Templates.xhtml.jsf.content</template>
+
+<template name="%Templates.xhtml.jsf.richfaces" description="%Templates.xhtml.jsf.richfaces.desc" id="org.jboss.tools.jsf.ui.richfaces" context="xhtml_new" enabled="true">%Templates.xhtml.jsf.richfaces.content</template>
+
</templates>
15 years, 8 months
- 1
- 0
JBoss Tools SVN: r24208 - trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2010-08-17 06:01:12 -0400 (Tue, 17 Aug 2010)
New Revision: 24208
Modified:
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/AbstractJBossWSCommandTest.java
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSClientCommandTest.java
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSClientSampleCreationCommandTest.java
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSTopDownCommandTest.java
Log:
JBIDE-6481: commit the test changes
Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/AbstractJBossWSCommandTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/AbstractJBossWSCommandTest.java 2010-08-17 09:46:32 UTC (rev 24207)
+++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/AbstractJBossWSCommandTest.java 2010-08-17 10:01:12 UTC (rev 24208)
@@ -67,6 +67,7 @@
import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ResourcesUtils;
import org.jboss.tools.test.util.TestProjectProvider;
+import org.jboss.tools.ws.creation.core.data.ServiceModel;
@SuppressWarnings("restriction")
public abstract class AbstractJBossWSCommandTest extends TestCase {
@@ -217,8 +218,6 @@
model.setWebProjectName(fproject.getProject().getName());
IFile wsdlFile = fproject.getProject().getFile(wsdlFileName);
model.setWsdlURI(wsdlFile.getLocation().toOSString());
- model.addServiceName("SOAPService");
- model.addPortTypes("Greeter");
model.setCustomPackage("org.apache.hello_world_soap_http");
return model;
Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSClientCommandTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSClientCommandTest.java 2010-08-17 09:46:32 UTC (rev 24207)
+++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSClientCommandTest.java 2010-08-17 10:01:12 UTC (rev 24208)
@@ -97,10 +97,8 @@
IStatus status = cmdInitial.execute(null, null);
assertTrue(status.getMessage(), status.isOK());
- assertTrue(model.getServiceNames().contains("SOAPService"));
assertEquals(wsdlFile.getLocation().toOSString(), model.getWsdlURI());
- assertTrue(model.getPortTypes().contains("Greeter"));
- assertEquals("org.apache.hello_world_soap_http", model
+ assertEquals("", model
.getCustomPackage());
}
Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSClientSampleCreationCommandTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSClientSampleCreationCommandTest.java 2010-08-17 09:46:32 UTC (rev 24207)
+++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSClientSampleCreationCommandTest.java 2010-08-17 10:01:12 UTC (rev 24208)
@@ -9,11 +9,11 @@
import org.eclipse.core.resources.IResource;
import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jdt.core.JavaCore;
-import org.jboss.tools.test.util.TestProjectProvider;
import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ResourcesUtils;
-import org.jboss.tools.ws.creation.core.commands.ClientSampleCreationCommand;
+import org.jboss.tools.test.util.TestProjectProvider;
import org.jboss.tools.ws.creation.core.data.ServiceModel;
+import org.jboss.tools.ws.creation.core.utils.JBossWSCreationUtils;
public class JBossWSClientSampleCreationCommandTest extends TestCase{
static String BUNDLE = "org.jboss.tools.ws.creation.core.test";
@@ -33,8 +33,7 @@
ServiceModel model = new ServiceModel();
model.setCustomPackage("");
model.setWebProjectName("WebTest");
- ClientSampleCreationCommand command = new ClientSampleCreationCommand(model);
- List<ICompilationUnit> list = command.findJavaUnitsByAnnotation(JavaCore.create(prj), "@WebService");
+ List<ICompilationUnit> list = JBossWSCreationUtils.findJavaUnitsByAnnotation(JavaCore.create(prj), "@WebService", "");
assertTrue("No java files in src!",list.isEmpty());
}
Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSTopDownCommandTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSTopDownCommandTest.java 2010-08-17 09:46:32 UTC (rev 24207)
+++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSTopDownCommandTest.java 2010-08-17 10:01:12 UTC (rev 24208)
@@ -109,10 +109,8 @@
IStatus status = cmdInitial.execute(null, null);
assertTrue(status.getMessage(), status.isOK());
- assertTrue(model.getServiceNames().contains("SOAPService"));
assertEquals(wsdlFile.getLocation().toOSString(), model.getWsdlURI());
- assertTrue(model.getPortTypes().contains("Greeter"));
- assertEquals("org.apache.hello_world_soap_http", model.getCustomPackage());
+ assertEquals("", model.getCustomPackage());
}
@@ -246,8 +244,6 @@
model.setWebProjectName(fproject.getProject().getName());
IFile wsdlFile = fproject.getProject().getFile(wsdlFileName);
model.setWsdlURI(wsdlFile.getLocation().toOSString());
- model.addServiceName("SOAPService");
- model.addPortTypes("Greeter");
model.setCustomPackage("org.apache.hello_world_soap_http");
return model;
15 years, 8 months
- 1
- 0
JBoss Tools SVN: r24207 - in trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core: data and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2010-08-17 05:46:32 -0400 (Tue, 17 Aug 2010)
New Revision: 24207
Modified:
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ClientSampleCreationCommand.java
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ImplementationClassCreationCommand.java
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialClientCommand.java
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialCommand.java
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/data/ServiceModel.java
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java
Log:
JBIDE-6481: commit to trunk with the test changes
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ClientSampleCreationCommand.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ClientSampleCreationCommand.java 2010-08-17 08:13:59 UTC (rev 24206)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ClientSampleCreationCommand.java 2010-08-17 09:46:32 UTC (rev 24207)
@@ -51,7 +51,6 @@
public static final String LINE_SEPARATOR = System
.getProperty("line.separator"); //$NON-NLS-1$
private static final String PACAKAGE = ".*"; //$NON-NLS-1$
- private static final String PACAKAGESPLIT = "\\."; //$NON-NLS-1$
private ServiceModel model;
private int serviceNum = 1;
@@ -77,16 +76,45 @@
}
// find web service client classes
- List<ICompilationUnit> clientUnits = findJavaUnitsByAnnotation(project,
- JBossWSCreationCoreMessages.WebserviceClient_Annotation);
+ List<ICompilationUnit> clientUnits = JBossWSCreationUtils
+ .findJavaUnitsByAnnotation(
+ project,
+ JBossWSCreationCoreMessages.WebserviceClient_Annotation,
+ model.getCustomPackage());
// find web service classes
- List<ICompilationUnit> serviceUnits = findJavaUnitsByAnnotation(
- project,
- JBossWSCreationCoreMessages.Webservice_Annotation_Check);
+ List<ICompilationUnit> serviceUnits = JBossWSCreationUtils
+ .findJavaUnitsByAnnotation(
+ project,
+ JBossWSCreationCoreMessages.Webservice_Annotation_Check,
+ model.getCustomPackage());
+ if (clientUnits.size() == 0) {
+ return status;
+ }
+
+ List<String> packageList = new LinkedList<String>();
+ for (ICompilationUnit unit : clientUnits) {
+ if (!packageList.contains(unit.getParent().getElementName())) {
+ packageList.add(unit.getParent().getElementName());
+ }
+ }
+ for (int j = 0; j < packageList.size(); j++) {
+ status = createImplClass(packageList.get(j), project,
+ clientUnits, serviceUnits);
+ if (!status.isOK()) {
+ break;
+ }
+ }
+
+ return status;
+ }
+
+ private IStatus createImplClass(String packageName, IJavaProject project,
+ List<ICompilationUnit> clientUnits,
+ List<ICompilationUnit> serviceUnits) {
// create a client sample class
- ICompilationUnit clientCls = createJavaClass(model.getCustomPackage()
+ ICompilationUnit clientCls = createJavaClass(packageName
+ JBossWSCreationCoreMessages.Client_Sample_Package_Name,
JBossWSCreationCoreMessages.Client_Sample_Class_Name, false,
null, project);
@@ -97,8 +125,7 @@
// add imports to client sample class
try {
- clientCls.createImport(model.getCustomPackage() + PACAKAGE, null,
- null);
+ clientCls.createImport(packageName + PACAKAGE, null, null);
clientCls.save(null, true);
} catch (Exception e1) {
JBossWSCreationCorePlugin.getDefault().logError(e1);
@@ -114,12 +141,12 @@
sb.append(LINE_SEPARATOR);
sb.append(" System.out.println(\"***********************\");"); //$NON-NLS-1$
sb.append(LINE_SEPARATOR);
- createWebServiceClient(clientUnits, serviceUnits, sb);
+ createWebServiceClient(clientUnits, serviceUnits, sb,packageName);
sb.append(" System.out.println(\"***********************\");"); //$NON-NLS-1$
sb.append(LINE_SEPARATOR);
sb.append(" System.out.println(\"").append( //$NON-NLS-1$
- JBossWSCreationCoreMessages.Client_Sample_Run_Over).append(
- "\");"); //$NON-NLS-1$
+ JBossWSCreationCoreMessages.Client_Sample_Run_Over)
+ .append("\");"); //$NON-NLS-1$
sb.append(LINE_SEPARATOR);
sb.append("}"); //$NON-NLS-1$
try {
@@ -130,8 +157,7 @@
return StatusUtils
.errorStatus(JBossWSCreationCoreMessages.Error_Create_Client_Sample);
}
-
- return status;
+ return Status.OK_STATUS;
}
/**
@@ -142,7 +168,6 @@
* @param method
* @param sb
*/
- @SuppressWarnings("unchecked")
private void createWebService(List<ICompilationUnit> serviceUnits,
MethodDeclaration method, StringBuffer sb) {
sb.append(" System.out.println(\"" //$NON-NLS-1$
@@ -161,10 +186,11 @@
parser.setResolveBindings(false);
parser.setFocalPosition(0);
CompilationUnit result = (CompilationUnit) parser.createAST(null);
+ @SuppressWarnings("rawtypes")
List types = result.types();
TypeDeclaration typeDec1 = (TypeDeclaration) types.get(0);
- if (typeDec1.getName().toString().equals(
- method.getReturnType2().toString())) {
+ if (typeDec1.getName().toString()
+ .equals(method.getReturnType2().toString())) {
callWebServiceOperation(typeDec1, sb);
}
}
@@ -198,15 +224,14 @@
boolean noNull = true;
for (int j = 0; j < method.parameters().size(); j++) {
- noNull = createWebServiceOperationParameters(method
- .parameters(), sb, j)
+ noNull = createWebServiceOperationParameters(
+ method.parameters(), sb, j)
&& noNull;
}
sb.append("));"); //$NON-NLS-1$
sb.append(LINE_SEPARATOR);
if (!noNull) {
- sb
- .append(" //Please input the parameters instead of 'null' for the upper method!"); //$NON-NLS-1$
+ sb.append(" //Please input the parameters instead of 'null' for the upper method!"); //$NON-NLS-1$
sb.append(LINE_SEPARATOR);
sb.append(LINE_SEPARATOR);
}
@@ -222,9 +247,8 @@
* @param sb
* @param j
*/
- @SuppressWarnings("unchecked")
- private boolean createWebServiceOperationParameters(List list,
- StringBuffer sb, int j) {
+ private boolean createWebServiceOperationParameters(
+ @SuppressWarnings("rawtypes") List list, StringBuffer sb, int j) {
SingleVariableDeclaration para = (SingleVariableDeclaration) list
.get(j);
@@ -255,22 +279,23 @@
* @param serviceUnits
* @param sb
*/
- @SuppressWarnings("unchecked")
- private void createWebServiceClient(List<ICompilationUnit> clientUnits,
- List<ICompilationUnit> serviceUnits, StringBuffer sb) {
+ private void createWebServiceClient(List<ICompilationUnit> clientUnits,List<ICompilationUnit> serviceUnits, StringBuffer sb,String packageName) {
sb.append(" System.out.println(\"" //$NON-NLS-1$
+ "Create Web Service Client...\");"); //$NON-NLS-1$
sb.append(LINE_SEPARATOR);
for (ICompilationUnit unit : clientUnits) {
// parse the unit
+ if(!packageName.equals(unit.getParent().getElementName())){
+ continue;
+ }
ASTParser parser = ASTParser.newParser(AST.JLS3);
parser.setSource(unit);
parser.setResolveBindings(false);
parser.setFocalPosition(0);
CompilationUnit result = (CompilationUnit) parser.createAST(null);
+ @SuppressWarnings("rawtypes")
List types = result.types();
TypeDeclaration typeDec = (TypeDeclaration) types.get(0);
-
sb.append(" " + typeDec.getName()); //$NON-NLS-1$
sb.append(" service").append(serviceNum).append(" = new "); //$NON-NLS-1$ //$NON-NLS-2$
sb.append(typeDec.getName());
@@ -284,8 +309,8 @@
if (method.modifiers().get(0) instanceof NormalAnnotation) {
NormalAnnotation anno = (NormalAnnotation) method
.modifiers().get(0);
- if (anno.getTypeName().getFullyQualifiedName().equals(
- JBossWSCreationCoreMessages.WebEndpoint)) {
+ if (anno.getTypeName().getFullyQualifiedName()
+ .equals(JBossWSCreationCoreMessages.WebEndpoint)) {
createWebService(serviceUnits, method, sb);
portNum += 1;
}
@@ -296,59 +321,6 @@
}
/**
- * find compilationunit by annotation
- *
- * @param project
- * @param annotation
- * @return
- */
- public List<ICompilationUnit> findJavaUnitsByAnnotation(
- IJavaProject project, String annotation) {
- List<ICompilationUnit> units = new LinkedList<ICompilationUnit>();
- try {
- ICompilationUnit[] javaFiles = null;
- if (project.findPackageFragment(addPackagetoPath(project)) != null) {
- javaFiles = project.findPackageFragment(
- addPackagetoPath(project)).getCompilationUnits();
- }
- if (javaFiles != null) {
- for (ICompilationUnit unit : javaFiles) {
- if (unit.getSource().contains(annotation)) {
- units.add(unit);
- }
- }
- }
- } catch (JavaModelException e) {
- JBossWSCreationCorePlugin.getDefault().logError(e);
- }
- return units;
- }
-
- /**
- * new a path by adding a java package
- *
- * @param project
- * @return
- * @throws JavaModelException
- */
- private IPath addPackagetoPath(IJavaProject project)
- throws JavaModelException {
- String packagename = model.getCustomPackage();
- String[] names = packagename.split(PACAKAGESPLIT);
- IPath path = new Path(JBossWSCreationUtils
- .getJavaProjectSrcLocation(project.getProject()));
- path = project.getPath().append(
- path.makeRelativeTo(project.getProject().getLocation()));
-
- if (names != null && names.length > 0) {
- for (String name : names) {
- path = path.append(name);
- }
- }
- return path;
- }
-
- /**
* create a java class
*
* @param packageName
@@ -362,8 +334,9 @@
String className, boolean isInterface, String interfaceName,
IJavaProject javaProject) {
try {
- IPath srcPath = new Path(JBossWSCreationUtils
- .getJavaProjectSrcLocation(javaProject.getProject()));
+ IPath srcPath = new Path(
+ JBossWSCreationUtils.getJavaProjectSrcLocation(javaProject
+ .getProject()));
srcPath = javaProject.getPath().append(
srcPath.makeRelativeTo(javaProject.getProject()
.getLocation()));
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ImplementationClassCreationCommand.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ImplementationClassCreationCommand.java 2010-08-17 08:13:59 UTC (rev 24206)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ImplementationClassCreationCommand.java 2010-08-17 09:46:32 UTC (rev 24207)
@@ -5,8 +5,6 @@
import java.util.List;
import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IWorkspaceRoot;
@@ -65,13 +63,13 @@
private static final String ANNOTATION_WEB_SERVICE_FULLNAME = "javax.jws.WebService"; //$NON-NLS-1$
private static final String ANNOTATION_TYPE_NAME_WEBSERVICE = "WebService";; //$NON-NLS-1$
- private static final String ANNOTATION_PROPERTY_NAME = "name"; //$NON-NLS-1$
private static final String ANNOTATION_PROPERTY_SERVICE_NAME = "serviceName"; //$NON-NLS-1$
private static final String ANNOTATION_PROPERTY_ENDPOINT_INTERFACE = "endpointInterface"; //$NON-NLS-1$
private ServiceModel model;
private IWorkspaceRoot fWorkspaceRoot;
private IProject project;
+ private String packageName;
public ImplementationClassCreationCommand(ServiceModel model) {
this.model = model;
@@ -90,13 +88,32 @@
}
IStatus status = Status.OK_STATUS;
- project = JBossWSCreationUtils.getProjectByName(model.getWebProjectName());
+ project = JBossWSCreationUtils.getProjectByName(model
+ .getWebProjectName());
try {
- List<String> portTypes = model.getPortTypes();
- for (String portTypeName : portTypes) {
- generateImplClass(formatPortTypeName(portTypeName));
- String implClsName = getImplPackageName() + "." //$NON-NLS-1$
- + getImplClassName(portTypeName);
+
+ IJavaProject javaPrj = JavaCore.create(project);
+ List<ICompilationUnit> serviceUnits = JBossWSCreationUtils
+ .findJavaUnitsByAnnotation(
+ javaPrj,
+ JBossWSCreationCoreMessages.Webservice_Annotation_Check,
+ model.getCustomPackage());
+
+ packageName = model.getCustomPackage();
+ boolean noPackageName = false;
+ if("".equals(packageName)){ //$NON-NLS-1$
+ noPackageName = true;
+ }
+ for (ICompilationUnit service : serviceUnits) {
+ if (!service.findPrimaryType().isInterface()) {
+ continue;
+ }
+ if(noPackageName){
+ packageName = service.getParent().getElementName();
+ }
+ generateImplClass(service);
+ String implClsName = getImplPackageName()
+ + "." + getImplClassName(getClassName(service.getElementName())); //$NON-NLS-1$
model.addServiceClasses(implClsName);
}
@@ -116,25 +133,18 @@
return status;
}
- private String formatPortTypeName(String portTypeName) {
- if (portTypeName == null || "".equals(portTypeName)) {//$NON-NLS-1$
- return portTypeName;
- }
- StringBuffer buf = new StringBuffer();
- String tem = buf.append(Character.toUpperCase(portTypeName.charAt(0)))
- .append(portTypeName.substring(1)).toString();
- return tem;
- }
-
@SuppressWarnings("unchecked")
- protected void generateImplClass(String portTypeName/* , IFile implJavaFile */)
+ protected void generateImplClass(ICompilationUnit service)
throws CoreException, BadLocationException {
+ ASTParser astp = ASTParser.newParser(AST.JLS3);
+ astp.setSource(service);
+ CompilationUnit cu = (CompilationUnit) astp.createAST(null);
+ IPackageFragment pack = getImplPakcage();
- CompilationUnit portTypeCU = getCompilationUnitForInterface(portTypeName);
+ String className = getClassName(service.getElementName());
- IPackageFragment pack = getImplPakcage();
+ String implFileName = getJavaFileName(className);
- String implFileName = getJavaFileName(portTypeName);
ICompilationUnit icu = pack.createCompilationUnit(implFileName,
"", true, null); //$NON-NLS-1$
// create a working copy with a new owner
@@ -163,26 +173,26 @@
implCu.setPackage(implPackage);
// add imports for implementation class
- addImportsToImplementationClass(implCu, portTypeCU, portTypeName);
+ addImportsToImplementationClass(implCu, cu, className);
// add class declaration
TypeDeclaration type = ast.newTypeDeclaration();
type.setInterface(false);
// add WebService annotation
- String endpoint = getPortTypeInterfaceFullName(portTypeName);
- NormalAnnotation ann = createAnnotation(ast, portTypeName, endpoint);
+ String endpoint = getServiceInterfaceFullName(className);
+ NormalAnnotation ann = createAnnotation(ast, className, endpoint);
type.modifiers().add(ann);
type.modifiers().add(
ast.newModifier(Modifier.ModifierKeyword.PUBLIC_KEYWORD));
- type.setName(ast.newSimpleName(getImplClassName(portTypeName)));
+ type.setName(ast.newSimpleName(getImplClassName(className)));
type.superInterfaceTypes().add(
- ast.newSimpleType(ast.newName(portTypeName)));
+ ast.newSimpleType(ast.newName(className)));
// add Logger variable declaration
// createLoggerField(ast, type, portTypeName);
// add method implementation
- TypeDeclaration inTD = (TypeDeclaration) portTypeCU.types().get(0);
+ TypeDeclaration inTD = (TypeDeclaration) cu.types().get(0);
// firstly, get all methods that declared in Interface class and then
// add corresponding methods to
// the impl class
@@ -209,11 +219,13 @@
}
private String getImplPackageName() {
- return model.getCustomPackage() /* + ".impl" */;
+ return packageName;
}
- private IPackageFragmentRoot getPackageFragmentRoot() throws JavaModelException {
- String str = model.getWebProjectName() + File.separator+ getSourceFolderPath(project);
+ private IPackageFragmentRoot getPackageFragmentRoot()
+ throws JavaModelException {
+ String str = model.getWebProjectName() + File.separator
+ + getSourceFolderPath(project);
IPath path = new Path(str);
IResource res = fWorkspaceRoot.findMember(path);
IJavaProject javaPrj = JavaCore.create(project);
@@ -221,19 +233,20 @@
}
- private String getJavaFileName(String portTypeName) {
+ private String getJavaFileName(String className) {
- return getImplClassName(portTypeName) + DEFAULT_CU_SUFFIX;
+ return getImplClassName(className) + DEFAULT_CU_SUFFIX;
}
- private String getImplClassName(String portTypeName) {
- String firstLetter = portTypeName.substring(0, 1);
- String implClsName = firstLetter.toUpperCase()
- + portTypeName.substring(1);
- implClsName = implClsName + "Impl"; //$NON-NLS-1$
- return implClsName;
+ private String getImplClassName(String className) {
+ return className + "Impl"; //$NON-NLS-1$
}
+ private String getClassName(String className) {
+ String clsName = className.substring(0, className.length() - 5);
+ return clsName;
+ }
+
private IPackageFragment getImplPakcage() throws JavaModelException {
IPackageFragmentRoot root = getPackageFragmentRoot();
String implPackageName = getImplPackageName();
@@ -247,31 +260,29 @@
return pack;
}
- private String getPortTypeInterfaceFullName(String portTypeName) {
- return model.getCustomPackage() + "." + portTypeName; //$NON-NLS-1$
+ private String getServiceInterfaceFullName(String className) {
+ return packageName + "." + className; //$NON-NLS-1$
}
@SuppressWarnings("unchecked")
private void addImportsToImplementationClass(CompilationUnit implCU,
- CompilationUnit portTypeCU, String portTypeName) {
- List<ImportDeclaration> imports = getImportsWithoutJaxwsAnnotation(portTypeCU);
+ CompilationUnit serviceCU, String serviceName) {
+ List<ImportDeclaration> imports = getImportsWithoutJaxwsAnnotation(serviceCU);
AST implAST = implCU.getAST();
// add imports for implementation class
for (ImportDeclaration id : imports) {
ImportDeclaration newId = implAST.newImportDeclaration();
- newId
- .setName(implAST.newName(id.getName()
- .getFullyQualifiedName()));
+ newId.setName(implAST.newName(id.getName().getFullyQualifiedName()));
implCU.imports().add(newId);
}
// import port type interface
ImportDeclaration importDec = implAST.newImportDeclaration();
- QualifiedName portTypeImport = implAST.newQualifiedName(implAST
- .newName(portTypeCU.getPackage().getName()
- .getFullyQualifiedName()), implAST
- .newSimpleName(portTypeName));
+ QualifiedName portTypeImport = implAST.newQualifiedName(
+ implAST.newName(serviceCU.getPackage().getName()
+ .getFullyQualifiedName()),
+ implAST.newSimpleName(serviceName));
importDec.setName(portTypeImport);
implCU.imports().add(importDec);
// importDec = implAST.newImportDeclaration();
@@ -289,13 +300,13 @@
* create web service annotation
*/
@SuppressWarnings("unchecked")
- protected NormalAnnotation createAnnotation(AST ast,
- String serviceName, String endpoint) {
+ protected NormalAnnotation createAnnotation(AST ast, String serviceName,
+ String endpoint) {
NormalAnnotation ann = ast.newNormalAnnotation();
ann.setTypeName(ast.newSimpleName(ANNOTATION_TYPE_NAME_WEBSERVICE));
- MemberValuePair member = createMemberValuePair(ast, ANNOTATION_PROPERTY_SERVICE_NAME,
- serviceName);
+ MemberValuePair member = createMemberValuePair(ast,
+ ANNOTATION_PROPERTY_SERVICE_NAME, serviceName);
ann.values().add(member);
member = createMemberValuePair(ast,
ANNOTATION_PROPERTY_ENDPOINT_INTERFACE, endpoint);
@@ -320,6 +331,7 @@
MethodDeclaration md = ast.newMethodDeclaration();
md.setConstructor(false);
+ @SuppressWarnings("rawtypes")
List modifiers = md.modifiers();
modifiers.add(ast.newModifier(Modifier.ModifierKeyword.PUBLIC_KEYWORD));
md.setName(ast
@@ -328,6 +340,7 @@
Type sType = copyTypeFromOtherASTNode(ast, inMethod.getReturnType2());
md.setReturnType2(sType);
+ @SuppressWarnings("rawtypes")
List parameters = inMethod.parameters();
for (Object obj : parameters) {
@@ -398,13 +411,13 @@
.getFullyQualifiedName()));
} else if (type instanceof ArrayType) {
ArrayType atype = (ArrayType) type;
- return ast.newArrayType(copyTypeFromOtherASTNode(ast, atype
- .getComponentType()));
+ return ast.newArrayType(copyTypeFromOtherASTNode(ast,
+ atype.getComponentType()));
} else if (type instanceof ParameterizedType) {
ParameterizedType ptype = (ParameterizedType) type;
ParameterizedType newParaType = ast
- .newParameterizedType(copyTypeFromOtherASTNode(ast, ptype
- .getType()));
+ .newParameterizedType(copyTypeFromOtherASTNode(ast,
+ ptype.getType()));
for (Object arg : ptype.typeArguments()) {
if (arg instanceof Type) {
Type newArg = copyTypeFromOtherASTNode(ast, (Type) arg);
@@ -422,10 +435,10 @@
return null;
}
- @SuppressWarnings("unchecked")
protected List<ImportDeclaration> getImportsWithoutJaxwsAnnotation(
CompilationUnit cu) {
List<ImportDeclaration> importList = new ArrayList<ImportDeclaration>();
+ @SuppressWarnings("rawtypes")
List imports = cu.imports();
for (Object obj : imports) {
ImportDeclaration id = (ImportDeclaration) obj;
@@ -438,41 +451,11 @@
return importList;
}
- private CompilationUnit getCompilationUnitForInterface(String portTypeName)
- throws CoreException {
- System.out.println(portTypeName);
- IFile inFile = getServiceInterfaceFile(portTypeName);
- if (!inFile.exists()) {
- throw new CoreException(
- StatusUtils
- .errorStatus(JBossWSCreationCoreMessages.Error_Message_Failed_To_Generate_Code));
- }
- ICompilationUnit icu = JBossWSCreationUtils.getJavaUnitFromFile(inFile);
- ASTParser astp = ASTParser.newParser(AST.JLS3);
- astp.setSource(icu);
-
- CompilationUnit cu = (CompilationUnit) astp.createAST(null);
-
- return cu;
- }
-
- private IFile getServiceInterfaceFile(String portTypeName)
+ private IPath getSourceFolderPath(IProject project)
throws JavaModelException {
- IFolder pkgFolder = getPackageFolder();
- IFile inFile = pkgFolder.getFile(portTypeName + DEFAULT_CU_SUFFIX);
- return inFile;
- }
-
- private IFolder getPackageFolder() throws JavaModelException {
- IFolder srcFolder = project.getFolder(getSourceFolderPath(project));
- String pkgFolderName = model.getCustomPackage().replace(".", //$NON-NLS-1$
- File.separator);
- return srcFolder.getFolder(pkgFolderName);
-
- }
-
- private IPath getSourceFolderPath(IProject project) throws JavaModelException{
- IPath path = new Path(JBossWSCreationUtils.getJavaProjectSrcLocation(project.getProject()));
+ IPath path = new Path(
+ JBossWSCreationUtils.getJavaProjectSrcLocation(project
+ .getProject()));
return path.makeRelativeTo(project.getProject().getLocation());
}
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialClientCommand.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialClientCommand.java 2010-08-17 08:13:59 UTC (rev 24206)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialClientCommand.java 2010-08-17 09:46:32 UTC (rev 24207)
@@ -11,8 +11,6 @@
package org.jboss.tools.ws.creation.core.commands;
-import javax.wsdl.WSDLException;
-
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IAdaptable;
@@ -24,11 +22,9 @@
import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient;
import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
import org.jboss.tools.ws.core.utils.StatusUtils;
-import org.jboss.tools.ws.creation.core.JBossWSCreationCorePlugin;
import org.jboss.tools.ws.creation.core.data.ServiceModel;
import org.jboss.tools.ws.creation.core.messages.JBossWSCreationCoreMessages;
import org.jboss.tools.ws.creation.core.utils.JBossWSCreationUtils;
-import org.jboss.tools.ws.creation.core.utils.WSDLPropertyReader;
/**
* @author Grid Qian
@@ -59,8 +55,10 @@
if (location.equals("")) { //$NON-NLS-1$
return StatusUtils
.errorStatus(JBossWSCreationCoreMessages.Error_WS_Location);
- } else if (!new Path(location).append(JBossWSCreationCoreMessages.Bin)
- .append(JBossWSCreationCoreMessages.Command).toFile().exists()) {
+ } else if (!new Path(location)
+ .append(JBossWSCreationCoreMessages.Bin)
+ .append(JBossWSCreationCoreMessages.Command).toFile()
+ .exists()) {
return StatusUtils
.errorStatus(JBossWSCreationCoreMessages.Error_WS_Location);
}
@@ -70,20 +68,9 @@
}
model.setTarget(JBossWSCreationCoreMessages.Value_Target_0);
if (scenario == WebServiceScenario.CLIENT) {
- try {
- model.setWsdlURI(wsClient.getWebServiceClientInfo()
- .getWsdlURL());
- WSDLPropertyReader reader = new WSDLPropertyReader();
- reader
- .readWSDL(wsClient.getWebServiceClientInfo()
- .getWsdlURL());
- model.setCustomPackage(""); //$NON-NLS-1$
- model.setServiceList(reader.getServiceList());
- model.setPortTypeList(reader.getPortTypeList());
- } catch (WSDLException e) {
- JBossWSCreationCorePlugin.getDefault().logError(e);
- return StatusUtils.errorStatus(e.getLocalizedMessage(), e);
- }
+ model.setWsdlURI(wsClient.getWebServiceClientInfo().getWsdlURL());
+ model.setCustomPackage(""); //$NON-NLS-1$
+
}
return Status.OK_STATUS;
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialCommand.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialCommand.java 2010-08-17 08:13:59 UTC (rev 24206)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialCommand.java 2010-08-17 09:46:32 UTC (rev 24207)
@@ -1,7 +1,5 @@
package org.jboss.tools.ws.creation.core.commands;
-import javax.wsdl.WSDLException;
-
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IAdaptable;
@@ -13,11 +11,9 @@
import org.eclipse.wst.ws.internal.wsrt.IWebService;
import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
import org.jboss.tools.ws.core.utils.StatusUtils;
-import org.jboss.tools.ws.creation.core.JBossWSCreationCorePlugin;
import org.jboss.tools.ws.creation.core.data.ServiceModel;
import org.jboss.tools.ws.creation.core.messages.JBossWSCreationCoreMessages;
import org.jboss.tools.ws.creation.core.utils.JBossWSCreationUtils;
-import org.jboss.tools.ws.creation.core.utils.WSDLPropertyReader;
@SuppressWarnings("restriction")
public class InitialCommand extends AbstractDataModelOperation {
@@ -56,17 +52,8 @@
}
model.setTarget(JBossWSCreationCoreMessages.Value_Target_0);
if (scenario == WebServiceScenario.TOPDOWN) {
- try {
- model.setWsdlURI(ws.getWebServiceInfo().getWsdlURL());
- WSDLPropertyReader reader = new WSDLPropertyReader();
- reader.readWSDL(ws.getWebServiceInfo().getWsdlURL());
- model.setCustomPackage(""); //$NON-NLS-1$
- model.setServiceList(reader.getServiceList());
- model.setPortTypeList(reader.getPortTypeList());
- } catch (WSDLException e) {
- JBossWSCreationCorePlugin.getDefault().logError(e);
- return StatusUtils.errorStatus(e.getLocalizedMessage(), e);
- }
+ model.setWsdlURI(ws.getWebServiceInfo().getWsdlURL());
+ model.setCustomPackage(""); //$NON-NLS-1$
} else {
model.addServiceClasses(ws.getWebServiceInfo().getImplURL());
}
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/data/ServiceModel.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/data/ServiceModel.java 2010-08-17 08:13:59 UTC (rev 24206)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/data/ServiceModel.java 2010-08-17 09:46:32 UTC (rev 24207)
@@ -9,8 +9,6 @@
private boolean serverStatus;
private String wsdlURI;
- private List<String> portTypes;
- private List<String> serviceNames;
private String customPackage;
private List<String> bindingFiles;
private String catalog;
@@ -58,38 +56,6 @@
this.customPackage = packageText;
}
- public List<String> getPortTypes() {
- if(portTypes == null){
- portTypes = new ArrayList<String>();
- }
- return portTypes;
- }
- public void addPortTypes(String portType) {
- this.portTypes = getPortTypes();
- if(!this.portTypes.contains(portType)){
- this.portTypes.add(portType);
- }
- }
- public void setPortTypeList(List<String> portTypeList) {
- this.portTypes = portTypeList;
- }
-
- public List<String> getServiceNames() {
- if(serviceNames == null){
- serviceNames = new ArrayList<String>();
- }
- return serviceNames;
- }
- public void addServiceName(String serviceName) {
- this.serviceNames = getServiceClasses();
- if(!serviceName.contains(serviceName)){
- this.serviceNames.add(serviceName);
- }
- }
- public void setServiceList(List<String> serviceList) {
- this.serviceNames = serviceList;
- }
-
public String getWsdlURI() {
return wsdlURI;
}
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java 2010-08-17 08:13:59 UTC (rev 24206)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java 2010-08-17 09:46:32 UTC (rev 24207)
@@ -25,6 +25,7 @@
import java.text.Collator;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
@@ -34,6 +35,7 @@
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jdt.core.IJavaElement;
@@ -58,6 +60,7 @@
import org.jboss.tools.ws.core.facet.delegate.IJBossWSFacetDataModelProperties;
import org.jboss.tools.ws.core.facet.delegate.JBossWSFacetInstallDataModelProvider;
import org.jboss.tools.ws.core.utils.StatusUtils;
+import org.jboss.tools.ws.creation.core.JBossWSCreationCorePlugin;
import org.jboss.tools.ws.creation.core.messages.JBossWSCreationCoreMessages;
public class JBossWSCreationUtils {
@@ -77,8 +80,8 @@
if (hasUpperCase(keyword)) {
return false;
}
- return (Arrays.binarySearch(javaKeyWords, keyword, Collator
- .getInstance(Locale.ENGLISH)) >= 0);
+ return (Arrays.binarySearch(javaKeyWords, keyword,
+ Collator.getInstance(Locale.ENGLISH)) >= 0);
}
private static boolean hasUpperCase(String nodeName) {
@@ -95,21 +98,25 @@
public static IProject getProjectByName(String project) {
String projectString = replaceEscapecharactors(project);
- return ResourcesPlugin.getWorkspace().getRoot().getProject(
- getProjectNameFromFramewokNameString(projectString));
+ return ResourcesPlugin
+ .getWorkspace()
+ .getRoot()
+ .getProject(getProjectNameFromFramewokNameString(projectString));
}
public static IPath getProjectRoot(String project) {
String projectString = replaceEscapecharactors(project);
- return ResourcesPlugin.getWorkspace().getRoot().getProject(
- getProjectNameFromFramewokNameString(projectString))
+ return ResourcesPlugin
+ .getWorkspace()
+ .getRoot()
+ .getProject(getProjectNameFromFramewokNameString(projectString))
.getLocation();
}
private static String replaceEscapecharactors(String vulnarableString) {
if (vulnarableString.indexOf("/") != -1) { //$NON-NLS-1$
- vulnarableString = vulnarableString.replace('/', File.separator
- .charAt(0));
+ vulnarableString = vulnarableString.replace('/',
+ File.separator.charAt(0));
}
return vulnarableString;
}
@@ -437,7 +444,7 @@
}
return path;
}
-
+
public static File findFileByPath(String name, String path) {
File ret = null;
File folder = new File(path);
@@ -455,6 +462,91 @@
}
}
return ret;
- }
+ }
+ /**
+ * find compilationunit by annotation
+ *
+ * @param project
+ * @param annotation
+ * @return
+ */
+ public static List<ICompilationUnit> findJavaUnitsByAnnotation(
+ IJavaProject project, String annotation, String packageName) {
+ List<ICompilationUnit> units = new LinkedList<ICompilationUnit>();
+ try {
+ IPath path = addPackagetoPath(project, packageName);
+ if (path == null) {
+ IResource[] resources = JBossWSCreationUtils
+ .getJavaSourceRoots(project.getProject());
+ if (resources != null && resources.length > 0) {
+ IJavaElement[] elements = project.getPackageFragmentRoot(
+ resources[0]).getChildren();
+ for (IJavaElement element : elements) {
+ if (IJavaElement.PACKAGE_FRAGMENT == element
+ .getElementType()) {
+ findInPackageFragment(units, element.getPath(),
+ project, annotation);
+ }
+ }
+ }
+ } else {
+ findInPackageFragment(units, path, project, annotation);
+ }
+ } catch (JavaModelException e) {
+ JBossWSCreationCorePlugin.getDefault().logError(e);
+ }
+ return units;
+ }
+
+ private static void findInPackageFragment(List<ICompilationUnit> units,
+ IPath path, IJavaProject project, String annotation) {
+ ICompilationUnit[] javaFiles = null;
+ try {
+ if (project.findPackageFragment(path) != null) {
+ javaFiles = project.findPackageFragment(path)
+ .getCompilationUnits();
+ }
+ if (javaFiles != null) {
+ for (ICompilationUnit unit : javaFiles) {
+ if (unit.getSource().contains(annotation)) {
+ units.add(unit);
+
+ }
+ }
+ }
+ } catch (JavaModelException e) {
+ JBossWSCreationCorePlugin.getDefault().logError(e);
+
+ }
+ }
+
+ /**
+ * new a path by adding a java package
+ *
+ * @param project
+ * @return
+ * @throws JavaModelException
+ */
+ public static IPath addPackagetoPath(IJavaProject project,
+ String packageName) throws JavaModelException {
+ String PACAKAGESPLIT = "\\."; //$NON-NLS-1$
+ if ("".equals(packageName)) { //$NON-NLS-1$
+ return null;
+ }
+ IPath path = new Path(
+ JBossWSCreationUtils.getJavaProjectSrcLocation(project
+ .getProject()));
+ String[] names = packageName.split(PACAKAGESPLIT);
+ path = project.getPath().append(
+ path.makeRelativeTo(project.getProject().getLocation()));
+
+ if (names != null && names.length > 0) {
+ for (String name : names) {
+ path = path.append(name);
+ }
+ }
+ return path;
+ }
+
}
15 years, 8 months
- 1
- 0