JBoss Tools SVN: r44330 - in trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test: src/org/jboss/tools/ws/jaxrs/core and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-10-05 02:54:35 -0400 (Fri, 05 Oct 2012)
New Revision: 44330
Removed:
trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/AllTests.java
Modified:
trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/pom.xml
Log:
Fixed - JBIDE-12799
Remove AllTests testsuite class, configure surefire to pick all Test classes instead
Modified: trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/pom.xml
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/pom.xml 2012-10-05 05:42:24 UTC (rev 44329)
+++ trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/pom.xml 2012-10-05 06:54:35 UTC (rev 44330)
@@ -13,8 +13,8 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <coverage.filter>org.jboss.tools.ws.creation.core*</coverage.filter>
- <emma.instrument.bundles>org.jboss.tools.ws.creation.core</emma.instrument.bundles>
+ <coverage.filter>org.jboss.tools.ws.jaxrs.core*</coverage.filter>
+ <emma.instrument.bundles>org.jboss.tools.ws.jaxrs.core</emma.instrument.bundles>
</properties>
<build>
@@ -28,6 +28,55 @@
<target>1.6</target>
</configuration>
</plugin>
+ <!-- to skip running tests (compile only) use commandline flag: -Dmaven.test.skip
+ To allow all tests in a pom to pass/fail, use commandline flag: -fae (fail
+ at end) -->
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <version>${tychoVersion}</version>
+ <configuration>
+ <useUIHarness>true</useUIHarness>
+ <useUIThread>true</useUIThread>
+ <!-- THE FOLLOWING LINE MUST NOT BE BROKEN BY AUTOFORMATTING -->
+ <!-- tycho.testArgLine repeated to keep jacoco configuration for jacoco-maven-plugin -->
+ <argLine>${tycho.testArgLine} ${memoryOptions1} ${memoryOptions2} ${applejdkProperties} ${platformSystemProperties} ${systemProperties} -Dusage_reporting_enabled=false -Dorg.jboss.tools.tests.skipPrivateRequirements=${skipPrivateRequirements}</argLine>
+ <!-- https://docs.sonatype.org/display/TYCHO/How+to+run+SWTBot+tests+with+Tycho -->
+ <!-- set useUIThread=true for regular ui tests -->
+ <!-- set useUIThread=false for swtbot tests -->
+
+ <!-- TODO: add new profile to permit running against JBDS product/application
+ for JBDS tests, against Eclipse SDK for JBT -->
+ <product>org.eclipse.platform.ide</product>
+ <application>org.eclipse.ui.ide.workbench</application>
+ <dependencies>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.platform.ide</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ <!-- http://www.jmock.org/maven.html -->
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock-legacy</artifactId>
+ <version>2.5.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock-junit4</artifactId>
+ <version>2.5.1</version>
+ </dependency>
+ </dependencies>
+ <includes>
+ <include>**/*TestCase.class</include>
+ </includes>
+ <excludes>
+ <exclude>**/Abstract*.class</exclude>
+ </excludes>
+ <parallel>true</parallel>
+ </configuration>
+ </plugin>
+
</plugins>
</build>
</project>
Deleted: trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/AllTests.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/AllTests.java 2012-10-05 05:42:24 UTC (rev 44329)
+++ trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/AllTests.java 2012-10-05 06:54:35 UTC (rev 44330)
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * 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:
- * Xavier Coulon - Initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.ws.jaxrs.core;
-
-import org.jboss.tools.ws.jaxrs.core.internal.configuration.ProjectBuilderUtilsTestCase;
-import org.jboss.tools.ws.jaxrs.core.internal.configuration.ProjectNatureUtilsTestCase;
-import org.jboss.tools.ws.jaxrs.core.internal.metamodel.builder.JavaElementChangedProcessorTestCase;
-import org.jboss.tools.ws.jaxrs.core.internal.metamodel.builder.JavaElementDeltaFilterTestCase;
-import org.jboss.tools.ws.jaxrs.core.internal.metamodel.builder.JavaElementDeltaScannerTestCase;
-import org.jboss.tools.ws.jaxrs.core.internal.metamodel.builder.JaxrsMetamodelBuilderTestCase;
-import org.jboss.tools.ws.jaxrs.core.internal.metamodel.builder.JaxrsMetamodelChangedProcessorTestCase;
-import org.jboss.tools.ws.jaxrs.core.internal.metamodel.builder.ResourceChangedListenerTestCase;
-import org.jboss.tools.ws.jaxrs.core.internal.metamodel.builder.ResourceChangedProcessorTestCase;
-import org.jboss.tools.ws.jaxrs.core.internal.metamodel.domain.JaxrsElementFactoryTestCase;
-import org.jboss.tools.ws.jaxrs.core.internal.metamodel.domain.JaxrsMetamodelTestCase;
-import org.jboss.tools.ws.jaxrs.core.internal.metamodel.validation.JaxrsApplicationValidatorTestCase;
-import org.jboss.tools.ws.jaxrs.core.internal.utils.CollectionUtilsTestCase;
-import org.jboss.tools.ws.jaxrs.core.internal.utils.WtpUtilsTestCase;
-import org.jboss.tools.ws.jaxrs.core.jdt.CompilationUnitsRepositoryTestCase;
-import org.jboss.tools.ws.jaxrs.core.jdt.JaxrsAnnotationScannerTestCase;
-import org.jboss.tools.ws.jaxrs.core.jdt.JdtUtilsTestCase;
-import org.jboss.tools.ws.jaxrs.core.pubsub.PubSubServiceTestCase;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-
-(a)RunWith(Suite.class)
-@SuiteClasses({ ProjectBuilderUtilsTestCase.class, ProjectNatureUtilsTestCase.class, JdtUtilsTestCase.class,
- CompilationUnitsRepositoryTestCase.class, JavaElementDeltaScannerTestCase.class,
- JavaElementDeltaFilterTestCase.class, JavaElementChangedProcessorTestCase.class,
- JaxrsMetamodelChangedProcessorTestCase.class, JaxrsMetamodelTestCase.class,
- JaxrsElementFactoryTestCase.class, JaxrsMetamodelBuilderTestCase.class, CollectionUtilsTestCase.class,
- PubSubServiceTestCase.class, JaxrsApplicationValidatorTestCase.class,
- ResourceChangedProcessorTestCase.class, ResourceChangedListenerTestCase.class,
- JaxrsAnnotationScannerTestCase.class, WtpUtilsTestCase.class})
-public class AllTests {
-
-}
12 years, 3 months
JBoss Tools SVN: r44329 - trunk/build/util/cleanup.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-10-05 01:42:24 -0400 (Fri, 05 Oct 2012)
New Revision: 44329
Modified:
trunk/build/util/cleanup/jbosstools-cleanup.sh
Log:
use a smaller date string to avoid blowing the register and ending up with 15602613d instead of 2d as age of folder
Modified: trunk/build/util/cleanup/jbosstools-cleanup.sh
===================================================================
--- trunk/build/util/cleanup/jbosstools-cleanup.sh 2012-10-05 05:09:39 UTC (rev 44328)
+++ trunk/build/util/cleanup/jbosstools-cleanup.sh 2012-10-05 05:42:24 UTC (rev 44329)
@@ -4,7 +4,6 @@
# --------------------------------------------------------------------------------
# clean JBT builds from sftp://tools@filemgmt.jboss.org/downloads_htdocs/tools/builds/nightly
-now=$(date +%s)
log=/tmp/${0##*/}.log.`date +%Y%m%d-%H%M`.txt
echo "Logfile: $log" | tee -a $log
@@ -98,8 +97,9 @@
rm -f $tmp
for dd in $all; do
keep=0;
- # sec=$(date -d "$(echo $dd | perl -pe "s/(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})/\1-\2-\3\ \4:\5/")" +%s) # convert buildID (folder) to timestamp, then to # seconds since epoch ## OLD FOLDER FORMAT
- sec=$(date -d "$(echo $dd | perl -pe "s/(\d{4})-(\d{2})-(\d{2})_(\d{2})-(\d{2})-(\d{2})-(H|B)(\d+)/\1-\2-\3\ \4:\5:\6/")" +%s) # convert buildID (folder) to timestamp, then to # seconds since epoch ## NEW FOLDER FORMAT
+ # convert buildID (folder) to timestamp, then to # seconds since 2009-01-01 00:00:00 (1230786000)
+ sec=$(date -d "$(echo $dd | perl -pe "s/(\d{4})-(\d{2})-(\d{2})_(\d{2})-(\d{2})-(\d{2})-(H|B)(\d+)/\1-\2-\3\ \4:\5:\6/")" +%s); (( sec = sec - 1230786000 ))
+ now=$(date +%s); (( now = now - 1230786000 ))
(( day = now - sec ))
(( day = day / 3600 / 24 ))
for n in $newest; do
12 years, 3 months
JBoss Tools SVN: r44328 - branches/jbosstools-4.0.0.Alpha2/build/util/cleanup.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-10-05 01:09:39 -0400 (Fri, 05 Oct 2012)
New Revision: 44328
Modified:
branches/jbosstools-4.0.0.Alpha2/build/util/cleanup/jbosstools-cleanup.sh
Log:
use H and B convention when parsing dates
Modified: branches/jbosstools-4.0.0.Alpha2/build/util/cleanup/jbosstools-cleanup.sh
===================================================================
--- branches/jbosstools-4.0.0.Alpha2/build/util/cleanup/jbosstools-cleanup.sh 2012-10-05 05:08:57 UTC (rev 44327)
+++ branches/jbosstools-4.0.0.Alpha2/build/util/cleanup/jbosstools-cleanup.sh 2012-10-05 05:09:39 UTC (rev 44328)
@@ -99,7 +99,7 @@
for dd in $all; do
keep=0;
# sec=$(date -d "$(echo $dd | perl -pe "s/(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})/\1-\2-\3\ \4:\5/")" +%s) # convert buildID (folder) to timestamp, then to # seconds since epoch ## OLD FOLDER FORMAT
- sec=$(date -d "$(echo $dd | perl -pe "s/(\d{4})-(\d{2})-(\d{2})_(\d{2})-(\d{2})-(\d{2})-H(\d+)/\1-\2-\3\ \4:\5:\6/")" +%s) # convert buildID (folder) to timestamp, then to # seconds since epoch ## NEW FOLDER FORMAT
+ sec=$(date -d "$(echo $dd | perl -pe "s/(\d{4})-(\d{2})-(\d{2})_(\d{2})-(\d{2})-(\d{2})-(H|B)(\d+)/\1-\2-\3\ \4:\5:\6/")" +%s) # convert buildID (folder) to timestamp, then to # seconds since epoch ## NEW FOLDER FORMAT
(( day = now - sec ))
(( day = day / 3600 / 24 ))
for n in $newest; do
12 years, 3 months
JBoss Tools SVN: r44327 - trunk/build/util/cleanup.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-10-05 01:08:57 -0400 (Fri, 05 Oct 2012)
New Revision: 44327
Modified:
trunk/build/util/cleanup/jbosstools-cleanup.sh
Log:
use H and B convention when parsing dates
Modified: trunk/build/util/cleanup/jbosstools-cleanup.sh
===================================================================
--- trunk/build/util/cleanup/jbosstools-cleanup.sh 2012-10-05 01:13:59 UTC (rev 44326)
+++ trunk/build/util/cleanup/jbosstools-cleanup.sh 2012-10-05 05:08:57 UTC (rev 44327)
@@ -99,7 +99,7 @@
for dd in $all; do
keep=0;
# sec=$(date -d "$(echo $dd | perl -pe "s/(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})/\1-\2-\3\ \4:\5/")" +%s) # convert buildID (folder) to timestamp, then to # seconds since epoch ## OLD FOLDER FORMAT
- sec=$(date -d "$(echo $dd | perl -pe "s/(\d{4})-(\d{2})-(\d{2})_(\d{2})-(\d{2})-(\d{2})-H(\d+)/\1-\2-\3\ \4:\5:\6/")" +%s) # convert buildID (folder) to timestamp, then to # seconds since epoch ## NEW FOLDER FORMAT
+ sec=$(date -d "$(echo $dd | perl -pe "s/(\d{4})-(\d{2})-(\d{2})_(\d{2})-(\d{2})-(\d{2})-(H|B)(\d+)/\1-\2-\3\ \4:\5:\6/")" +%s) # convert buildID (folder) to timestamp, then to # seconds since epoch ## NEW FOLDER FORMAT
(( day = now - sec ))
(( day = day / 3600 / 24 ))
for n in $newest; do
12 years, 3 months
JBoss Tools SVN: r44326 - trunk/central/features/org.jboss.tools.central.themes.feature/sourceTemplateFeature.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-10-04 21:13:59 -0400 (Thu, 04 Oct 2012)
New Revision: 44326
Added:
trunk/central/features/org.jboss.tools.central.themes.feature/sourceTemplateFeature/.gitkeep
Log:
added .gitkeep to avoid deleting directory during migration to git
Added: trunk/central/features/org.jboss.tools.central.themes.feature/sourceTemplateFeature/.gitkeep
===================================================================
12 years, 3 months
JBoss Tools SVN: r44325 - trunk/maven/features/org.jboss.tools.maven.gwt.feature/sourceTemplateFeature.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-10-04 21:03:18 -0400 (Thu, 04 Oct 2012)
New Revision: 44325
Added:
trunk/maven/features/org.jboss.tools.maven.gwt.feature/sourceTemplateFeature/.gitkeep
Log:
added .gitkeep to keep it during migration
Added: trunk/maven/features/org.jboss.tools.maven.gwt.feature/sourceTemplateFeature/.gitkeep
===================================================================
12 years, 3 months
JBoss Tools SVN: r44324 - trunk/examples/plugins/org.jboss.tools.project.examples.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-10-04 20:46:27 -0400 (Thu, 04 Oct 2012)
New Revision: 44324
Modified:
trunk/examples/plugins/org.jboss.tools.project.examples/build.properties
Log:
removed reference to empty directory from build.properties file
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/build.properties
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/build.properties 2012-10-05 00:33:16 UTC (rev 44323)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/build.properties 2012-10-05 00:46:27 UTC (rev 44324)
@@ -10,5 +10,4 @@
about.mappings,\
about.properties,\
schema/,\
- jboss_about.png,\
- OSGI-INF/
+ jboss_about.png
12 years, 3 months
JBoss Tools SVN: r44323 - trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/wizard/service.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-10-04 20:33:16 -0400 (Thu, 04 Oct 2012)
New Revision: 44323
Modified:
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/wizard/service/RegisterAsServiceDialog.java
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/wizard/service/RegisterAsServiceHandler.java
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/wizard/service/RegisterServiceUtil.java
Log:
JBIDE-12793
https://issues.jboss.org/browse/JBIDE-12793
Code modified to simplify dialog testing.
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/wizard/service/RegisterAsServiceDialog.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/wizard/service/RegisterAsServiceDialog.java 2012-10-04 23:13:19 UTC (rev 44322)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/wizard/service/RegisterAsServiceDialog.java 2012-10-05 00:33:16 UTC (rev 44323)
@@ -3,8 +3,10 @@
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
import java.util.Map;
+import java.util.TreeMap;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.Flags;
@@ -23,6 +25,8 @@
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.jboss.tools.common.java.IParametedType;
+import org.jboss.tools.common.java.ParametedType;
+import org.jboss.tools.common.java.ParametedTypeFactory;
import org.jboss.tools.common.ui.CommonUIMessages;
import org.jboss.tools.common.ui.CommonUIPlugin;
import org.jboss.tools.common.ui.widget.editor.IFieldEditor;
@@ -34,10 +38,11 @@
IFieldEditor serviceTypeSelector;
String result;
- public RegisterAsServiceDialog(Shell parentShell, IType type, Map<String, IParametedType> types) {
+ public RegisterAsServiceDialog(Shell parentShell, IType type) {
super(parentShell);
this.type = type;
- this.types = types;
+ initTypes();
+
setShellStyle(getShellStyle() | SWT.RESIZE);
List<String> serviceTypeNames = new ArrayList<String>(types.keySet());
String defaultValue = serviceTypeNames.isEmpty() ? "" : serviceTypeNames.get(0);
@@ -45,6 +50,21 @@
CommonUIMessages.REGISTER_AS_SERVICE_TYPE_LABEL, serviceTypeNames, defaultValue);
}
+ void initTypes() {
+ ParametedType parametedType = new ParametedTypeFactory().newParametedType(type);
+ Collection<IParametedType> ts = parametedType.getAllTypes();
+ Map<String, IParametedType> types = new TreeMap<String, IParametedType>();
+ for (IParametedType t: ts) {
+ if(t.getType() != null) {
+ String q = t.getType().getFullyQualifiedName();
+ types.put(q, t);
+ }
+ }
+ types.remove("java.lang.Object"); //$NON-NLS-1$
+ types.remove(type.getFullyQualifiedName());
+ this.types = types;
+ }
+
private final int DIALOG_WIDTH = 400;
private final int DIALOG_HEIGHT = 60;
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/wizard/service/RegisterAsServiceHandler.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/wizard/service/RegisterAsServiceHandler.java 2012-10-04 23:13:19 UTC (rev 44322)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/wizard/service/RegisterAsServiceHandler.java 2012-10-05 00:33:16 UTC (rev 44323)
@@ -10,14 +10,9 @@
******************************************************************************/
package org.jboss.tools.common.ui.wizard.service;
-import java.util.Collection;
-import java.util.Map;
-import java.util.TreeMap;
-
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.expressions.IEvaluationContext;
-import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.Flags;
import org.eclipse.jdt.core.ICompilationUnit;
@@ -25,11 +20,9 @@
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.ISources;
import org.eclipse.ui.handlers.HandlerUtil;
-import org.jboss.tools.common.java.IParametedType;
-import org.jboss.tools.common.java.ParametedType;
-import org.jboss.tools.common.java.ParametedTypeFactory;
import org.jboss.tools.common.ui.CommonUIPlugin;
/**
@@ -47,6 +40,14 @@
setBaseEnabled(computeEnabled(evaluationContext));
}
+ @Override
+ public Object execute(ExecutionEvent event) throws org.eclipse.core.commands.ExecutionException {
+ ISelection selection = HandlerUtil.getActiveWorkbenchWindow(event).getSelectionService().getSelection();
+ Shell shell = HandlerUtil.getActiveShell(event);
+ invokeWizard(selection, shell);
+ return null;
+ }
+
private boolean computeEnabled(Object evaluationContext) {
if(evaluationContext instanceof IEvaluationContext) {
IEvaluationContext c = (IEvaluationContext)evaluationContext;
@@ -61,7 +62,7 @@
* @param selection
* @return
*/
- private IType getSelectedType(ISelection selection) {
+ public static IType getSelectedType(ISelection selection) {
if(selection != null && !selection.isEmpty() && (selection instanceof IStructuredSelection)) {
for (Object selected: ((IStructuredSelection)selection).toList()) {
try {
@@ -86,44 +87,22 @@
return null;
}
- private boolean accept(IType type) throws CoreException {
+ private static boolean accept(IType type) throws CoreException {
return !type.isInterface() && !type.isAnnotation() && !Flags.isAbstract(type.getFlags());
}
- @Override
- public Object execute(ExecutionEvent event) throws org.eclipse.core.commands.ExecutionException {
- ISelection selection = HandlerUtil.getActiveWorkbenchWindow(event).getSelectionService().getSelection();
+ public static void invokeWizard(ISelection selection, Shell shell) {
IType type = getSelectedType(selection);
if(type == null) {
- return null;
+ return;
}
+ RegisterAsServiceDialog dialog = new RegisterAsServiceDialog(shell, type);
try {
- ParametedType parametedType = new ParametedTypeFactory().newParametedType(type);
- Collection<IParametedType> ts = parametedType.getAllTypes();
- Map<String, IParametedType> types = new TreeMap<String, IParametedType>();
- for (IParametedType t: ts) {
- if(t.getType() != null) {
- String q = t.getType().getFullyQualifiedName();
- types.put(q, t);
- }
+ if(dialog.open() == IDialogConstants.OK_ID) {
+ RegisterServiceUtil.registerService(type, dialog.getResult());
}
- types.remove("java.lang.Object"); //$NON-NLS-1$
- types.remove(type.getFullyQualifiedName());
-
- RegisterAsServiceDialog dialog = new RegisterAsServiceDialog(HandlerUtil.getActiveShell(event), type, types);
- dialog.create();
-
- int i = dialog.open();
- if(i == IDialogConstants.OK_ID) {
- IProject project = type.getJavaProject().getProject();
- String typeName = type.getFullyQualifiedName();
- String serviceType = dialog.getResult();
- RegisterServiceUtil.registerService(project, typeName, serviceType);
- }
} catch (CoreException e) {
CommonUIPlugin.getDefault().logError(e);
}
- return null;
}
-
}
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/wizard/service/RegisterServiceUtil.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/wizard/service/RegisterServiceUtil.java 2012-10-04 23:13:19 UTC (rev 44322)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/wizard/service/RegisterServiceUtil.java 2012-10-05 00:33:16 UTC (rev 44323)
@@ -20,6 +20,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
+import org.eclipse.jdt.core.IType;
import org.jboss.tools.common.EclipseUtil;
import org.jboss.tools.common.ui.CommonUIPlugin;
import org.jboss.tools.common.util.FileUtil;
@@ -113,6 +114,12 @@
}
}
+ public static void registerService(IType type, String serviceType) throws CoreException {
+ IProject project = type.getJavaProject().getProject();
+ String typeName = type.getFullyQualifiedName();
+ registerService(project, typeName, serviceType);
+ }
+
/**
* Returns the first existing 'META-INF/services' folder in a Java source folder,
* or newly created 'META-INF/services' folder in an existing Java source folder if 'create' is set to true,
12 years, 3 months
JBoss Tools SVN: r44322 - trunk/as/tests/org.jboss.ide.eclipse.as.test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-10-04 19:13:19 -0400 (Thu, 04 Oct 2012)
New Revision: 44322
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.test/build.properties
Log:
removed missing folder referenced in build.properties
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/build.properties
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/build.properties 2012-10-04 23:07:30 UTC (rev 44321)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/build.properties 2012-10-04 23:13:19 UTC (rev 44322)
@@ -1,6 +1,5 @@
bin.includes = META-INF/,\
projects/,\
- testOutputs/,\
projectPieces/,\
plugin.properties,\
serverMock/,\
12 years, 3 months
JBoss Tools SVN: r44321 - in trunk: seam/tests/org.jboss.tools.seam.ui.test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-10-04 19:07:30 -0400 (Thu, 04 Oct 2012)
New Revision: 44321
Removed:
trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/resources/
trunk/seam/tests/org.jboss.tools.seam.ui.test/seam/
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/.classpath
trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/build.properties
trunk/seam/tests/org.jboss.tools.seam.ui.test/build.properties
Log:
removed empty folders, adjusted build.properties and .classpath files
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/.classpath
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/.classpath 2012-10-04 22:55:26 UTC (rev 44320)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/.classpath 2012-10-04 23:07:30 UTC (rev 44321)
@@ -3,6 +3,5 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/"/>
- <classpathentry kind="src" path="resources/"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/build.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/build.properties 2012-10-04 22:55:26 UTC (rev 44320)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/build.properties 2012-10-04 23:07:30 UTC (rev 44321)
@@ -4,8 +4,7 @@
META-INF/,\
about.html,\
.
-source.. = src/,\
- resources/
+source.. = src/
jars.compile.order = .
src.includes = resources/,\
src/,\
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/build.properties
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/build.properties 2012-10-04 22:55:26 UTC (rev 44320)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/build.properties 2012-10-04 23:07:30 UTC (rev 44321)
@@ -1,6 +1,5 @@
bin.includes = META-INF/,\
projects/,\
- seam/,\
plugin.properties,\
.
jars.compile.order = .
12 years, 3 months