JBoss Tools SVN: r30694 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2011-04-21 04:35:19 -0400 (Thu, 21 Apr 2011)
New Revision: 30694
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/plugin.xml
Log:
https://issues.jboss.org/browse/JBIDE-8677
Temporary removed not working library provider
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/plugin.xml
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/plugin.xml 2011-04-20 23:23:42 UTC (rev 30693)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/plugin.xml 2011-04-21 08:35:19 UTC (rev 30694)
@@ -26,7 +26,7 @@
</listener>
</extension>
- <extension
+ <!--extension
point="org.eclipse.jst.common.project.facet.core.libraryProviders">
<provider id="hibernate-user-library-provider" extends="wtp-user-library-provider">
@@ -50,6 +50,6 @@
</enablement>
</provider>
- </extension>
+ </extension-->
</plugin>
14 years, 11 months
JBoss Tools SVN: r30693 - trunk/smooks/docs/reference/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-04-20 19:23:42 -0400 (Wed, 20 Apr 2011)
New Revision: 30693
Modified:
trunk/smooks/docs/reference/en-US/Book_Info.xml
Log:
updated pubsnumber for publican
Modified: trunk/smooks/docs/reference/en-US/Book_Info.xml
===================================================================
--- trunk/smooks/docs/reference/en-US/Book_Info.xml 2011-04-20 23:17:43 UTC (rev 30692)
+++ trunk/smooks/docs/reference/en-US/Book_Info.xml 2011-04-20 23:23:42 UTC (rev 30693)
@@ -7,7 +7,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>4.1</productnumber>
<edition>4.1.0</edition>
- <pubsnumber>1</pubsnumber>
+ <pubsnumber>2</pubsnumber>
<abstract>
<para>The Smooks Developer Tools Reference Guide explains how to use Smooks Tools to graphically edit Smooks configuration files.</para>
</abstract>
14 years, 11 months
JBoss Tools SVN: r30692 - trunk/smooks/docs/reference/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-04-20 19:17:43 -0400 (Wed, 20 Apr 2011)
New Revision: 30692
Modified:
trunk/smooks/docs/reference/en-US/Book_Info.xml
Log:
updated with branding relating to 4.1 release
Modified: trunk/smooks/docs/reference/en-US/Book_Info.xml
===================================================================
--- trunk/smooks/docs/reference/en-US/Book_Info.xml 2011-04-20 23:03:43 UTC (rev 30691)
+++ trunk/smooks/docs/reference/en-US/Book_Info.xml 2011-04-20 23:17:43 UTC (rev 30692)
@@ -5,9 +5,9 @@
<title>Smooks Developer Tools Reference Guide</title>
<subtitle>Provides information relating to the Smooks Tools module.</subtitle>
<productname>JBoss Developer Studio</productname>
- <productnumber>4.0</productnumber>
- <edition>4.0.0</edition>
- <pubsnumber>9</pubsnumber>
+ <productnumber>4.1</productnumber>
+ <edition>4.1.0</edition>
+ <pubsnumber>1</pubsnumber>
<abstract>
<para>The Smooks Developer Tools Reference Guide explains how to use Smooks Tools to graphically edit Smooks configuration files.</para>
</abstract>
14 years, 11 months
JBoss Tools SVN: r30691 - trunk/smooks/docs/reference/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-04-20 19:03:43 -0400 (Wed, 20 Apr 2011)
New Revision: 30691
Modified:
trunk/smooks/docs/reference/en-US/tasks.xml
Log:
updated
Modified: trunk/smooks/docs/reference/en-US/tasks.xml
===================================================================
--- trunk/smooks/docs/reference/en-US/tasks.xml 2011-04-20 22:13:37 UTC (rev 30690)
+++ trunk/smooks/docs/reference/en-US/tasks.xml 2011-04-20 23:03:43 UTC (rev 30691)
@@ -106,7 +106,6 @@
<section id="mapping">
<title>Java Mapping Task</title>
-
<para>
If you decide to do Java Mapping, you need to make sure that your Input reader has been set up and you have some sample data specified. Then you should select <emphasis>Input Task</emphasis> in the Process tab and click the plus (+) sign to the right of the icon. Select <emphasis>Java Mapping</emphasis> from the popup menu and it will appear to the right, connected to <emphasis>Input Task</emphasis>. Then select <emphasis>Java Mapping</emphasis> task.
</para>
14 years, 11 months
JBoss Tools SVN: r30690 - in trunk/as: plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-04-20 18:13:37 -0400 (Wed, 20 Apr 2011)
New Revision: 30690
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7JSTPublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedFolderPublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedJSTPublisher.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeploymentTester.java
Log:
/JBIDE-8724 - test case fixes
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java 2011-04-20 21:28:54 UTC (rev 30689)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java 2011-04-20 22:13:37 UTC (rev 30690)
@@ -78,7 +78,7 @@
if( module.length > 1 )
return null;
- if( JBoss7Server.supportsJBoss7Deployment(server))
+ if( JBoss7Server.supportsJBoss7MarkerDeployment(server))
return handleJBoss7Deployment(method, server, module, publishType, delta, monitor);
IDeployableServer ds = ServerConverter.getDeployableServer(server);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java 2011-04-20 21:28:54 UTC (rev 30689)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java 2011-04-20 22:13:37 UTC (rev 30690)
@@ -19,7 +19,7 @@
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
import org.jboss.ide.eclipse.as.wtp.core.modules.IJBTModule;
-public class SingleFilePublisher extends JBoss7JSTPublisher {
+public class SingleFilePublisher extends AbstractJSTPublisher {
protected boolean forceZipModule(IModule[] moduleTree) {
return false;
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7JSTPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7JSTPublisher.java 2011-04-20 21:28:54 UTC (rev 30689)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7JSTPublisher.java 2011-04-20 22:13:37 UTC (rev 30690)
@@ -20,7 +20,6 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
import org.eclipse.wst.server.core.IModule;
@@ -41,24 +40,25 @@
public class JBoss7JSTPublisher extends AbstractJSTPublisher {
// Same as super class but just a *bit* different
public boolean accepts(String method, IServer server, IModule[] module) {
- return super.accepts(method, server, module) && server.loadAdapter(JBoss7Server.class, new NullProgressMonitor()) != null;
+ return super.accepts(method, server, module) &&
+ JBoss7Server.supportsJBoss7MarkerDeployment(server);
}
- public static final String DO_DEPLOY = ".dodeploy"; //$NON-NLS-1$
- public static final String DEPLOYING = ".deploying"; //$NON-NLS-1$
- public static final String DEPLOYED = ".isdeployed"; //$NON-NLS-1$
- public static final String FAILED_DEPLOY = ".faileddeploy"; //$NON-NLS-1$
- public static final String UNDEPLOYING = ".undeploying"; //$NON-NLS-1$
- public static final String UNDEPLOYED = ".undeployed"; //$NON-NLS-1$
-
+ public static final String DEPLOYED = ".deployed"; //$NON-NLS-1$
+ public static final String FAILED_DEPLOY = ".failed";//$NON-NLS-1$
+ public static final String DO_DEPLOY = ".dodeploy";//$NON-NLS-1$
+ public static final String DEPLOYING = ".isdeploying";//$NON-NLS-1$
+ public static final String UNDEPLOYING = ".isundeploying";//$NON-NLS-1$
+ public static final String UNDEPLOYED = ".undeployed";//$NON-NLS-1$
+ public static final String SKIP_DEPLOY = ".skipdeploy";//$NON-NLS-1$
+ public static final String PENDING = ".pending";//$NON-NLS-1$
+
public IStatus publishModule(
IJBossServerPublishMethod method,
IServer server, IModule[] module,
int publishType, IModuleResourceDelta[] delta,
IProgressMonitor monitor) throws CoreException {
- IJBoss7ManagementService service = JBoss7ManagementUtil.findManagementService(server);
- if( !JBoss7Server.supportsJBoss7Deployment(server))
- return super.publishModule(method, server, module, publishType, delta, monitor);
+ //IJBoss7ManagementService service = JBoss7ManagementUtil.findManagementService(server);
// jboss-7 specific
IDeployableServer ds = ServerConverter.getDeployableServer(server);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java 2011-04-20 21:28:54 UTC (rev 30689)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java 2011-04-20 22:13:37 UTC (rev 30690)
@@ -34,7 +34,7 @@
}
- public static boolean supportsJBoss7Deployment(IServer server) {
+ public static boolean supportsJBoss7MarkerDeployment(IServer server) {
if( server.loadAdapter(IJBoss7Deployment.class, new NullProgressMonitor()) != null )
return true;
return false;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedFolderPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedFolderPublisher.java 2011-04-20 21:28:54 UTC (rev 30689)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedFolderPublisher.java 2011-04-20 22:13:37 UTC (rev 30690)
@@ -26,8 +26,8 @@
*/
public class RSEZippedFolderPublisher extends RSEZippedJSTPublisher {
public boolean accepts(String method, IServer server, IModule[] module) {
- if( !LocalPublishMethod.LOCAL_PUBLISH_METHOD.equals(method))
- return true;
+ if( LocalPublishMethod.LOCAL_PUBLISH_METHOD.equals(method))
+ return false;
IDeployableServer ds = ServerConverter.getDeployableServer(server);
if( module != null && module.length > 0
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedJSTPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedJSTPublisher.java 2011-04-20 21:28:54 UTC (rev 30689)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedJSTPublisher.java 2011-04-20 22:13:37 UTC (rev 30690)
@@ -133,7 +133,7 @@
);
// method2.getFileService().upload(sourcePath.toFile(), destFolder.toString(), name, true, null, null,
// AbstractServerToolsPublisher.getSubMon(monitor, 150));
- if( JBoss7Server.supportsJBoss7Deployment(server))
+ if( JBoss7Server.supportsJBoss7MarkerDeployment(server))
JBoss7JSTPublisher.addDoDeployMarkerFile(method, ServerConverter.getDeployableServer(server), module, monitor);
} catch( SystemMessageException sme ) {
return new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, sme.getMessage(), sme);
@@ -147,7 +147,7 @@
IPath destFolder, String name, IProgressMonitor monitor) throws CoreException {
IDeployableServer ds = ServerConverter.getDeployableServer(server);
try {
- if( JBoss7Server.supportsJBoss7Deployment(server))
+ if( JBoss7Server.supportsJBoss7MarkerDeployment(server))
return JBoss7JSTPublisher.removeDeployedMarkerFile(method, ds, module, monitor);
return removeRemoteDeploymentFolder(sourcePath, destFolder, name, monitor);
} catch( SystemElementNotFoundException senfe ) {
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeploymentTester.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeploymentTester.java 2011-04-20 21:28:54 UTC (rev 30689)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeploymentTester.java 2011-04-20 22:13:37 UTC (rev 30690)
@@ -24,6 +24,7 @@
import org.jboss.ide.eclipse.as.test.ASTest;
import org.jboss.ide.eclipse.as.test.util.IOUtil;
import org.jboss.ide.eclipse.as.test.util.ServerRuntimeUtils;
+import org.jboss.tools.test.util.JobUtils;
public class SingleFileDeploymentTester extends JSTDeploymentTester {
public void testSingleFile() throws CoreException, IOException {
@@ -41,6 +42,7 @@
assertEquals(IOUtil.countFiles(deployRoot.toFile()), 0);
assertEquals(IOUtil.countAllResources(deployRoot.toFile()), 1);
ServerRuntimeUtils.publish(server);
+ JobUtils.waitForIdle();
assertEquals(IOUtil.countFiles(deployRoot.toFile()), 1);
assertEquals(IOUtil.countAllResources(deployRoot.toFile()), 2);
assertContents(deployRoot.append("test.xml").toFile(),
@@ -49,6 +51,7 @@
assertContents(deployRoot.append("test.xml").toFile(),
"<test>done</test>");
ServerRuntimeUtils.publish(server);
+ JobUtils.waitForIdle();
assertContents(deployRoot.append("test.xml").toFile(),
"<test>done2</test>");
server = ServerRuntimeUtils.removeModule(server, mods[0]);
@@ -56,6 +59,7 @@
"<test>done2</test>");
assertEquals(IOUtil.countAllResources(deployRoot.toFile()), 2);
ServerRuntimeUtils.publish(server);
+ JobUtils.waitForIdle();
assertFalse(deployRoot.append("test.xml").toFile().exists());
assertEquals(IOUtil.countAllResources(deployRoot.toFile()), 1);
}
14 years, 11 months
JBoss Tools SVN: r30689 - branches/jbosstools-3.2.x/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-04-20 17:28:54 -0400 (Wed, 20 Apr 2011)
New Revision: 30689
Modified:
branches/jbosstools-3.2.x/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ProducerMethodDefinitionTest.java
Log:
JBIDE-8639
https://issues.jboss.org/browse/JBIDE-8639
Modified: branches/jbosstools-3.2.x/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ProducerMethodDefinitionTest.java
===================================================================
--- branches/jbosstools-3.2.x/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ProducerMethodDefinitionTest.java 2011-04-20 21:26:22 UTC (rev 30688)
+++ branches/jbosstools-3.2.x/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ProducerMethodDefinitionTest.java 2011-04-20 21:28:54 UTC (rev 30689)
@@ -10,11 +10,15 @@
******************************************************************************/
package org.jboss.tools.cdi.core.test.tck;
+import java.util.List;
import java.util.Set;
+import org.eclipse.core.resources.IFile;
import org.eclipse.jdt.core.JavaModelException;
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.IInjectionPoint;
+import org.jboss.tools.cdi.core.IParameter;
+import org.jboss.tools.cdi.core.IProducerMethod;
/**
* @author Alexey Kazakov
@@ -38,4 +42,47 @@
}
// TODO continue implementing producer tests.
+
+ public void testParameterDefinition() {
+ IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/SpiderProducer.java");
+ Set<IBean> bs = cdiProject.getBeans(file.getFullPath());
+ IProducerMethod producer = null;
+ for (IBean bean: bs) {
+ if(bean instanceof IProducerMethod) {
+ IProducerMethod m = (IProducerMethod)bean;
+ if(m.getMethod().getElementName().equals("produceSpiderFromInjection")) {
+ producer = m;
+ }
+ }
+ }
+ assertNotNull(producer);
+ List<IParameter> ps = producer.getParameters();
+ assertEquals(1, ps.size());
+ IParameter param = ps.get(0);
+ assertTrue(param.isAnnotationPresent("org.jboss.jsr299.tck.tests.definition.qualifier.Tame"));
+
+
+ }
+
+ public void testParameterDefinitionOnBrokenMethod() {
+ IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/SpiderProducer_Broken.java");
+ Set<IBean> bs = cdiProject.getBeans(file.getFullPath());
+ IProducerMethod producer = null;
+ for (IBean bean: bs) {
+ if(bean instanceof IProducerMethod) {
+ IProducerMethod m = (IProducerMethod)bean;
+ if(m.getMethod().getElementName().equals("produceSpiderFromInjection")) {
+ producer = m;
+ }
+ }
+ }
+ assertNotNull(producer);
+ List<IParameter> ps = producer.getParameters();
+ assertEquals(1, ps.size());
+ IParameter param = ps.get(0);
+ assertTrue(param.isAnnotationPresent("org.jboss.jsr299.tck.tests.definition.qualifier.Tame"));
+
+
+ }
+
}
\ No newline at end of file
14 years, 11 months
JBoss Tools SVN: r30688 - branches/jbosstools-3.2.x/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/definition/qualifier.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-04-20 17:26:22 -0400 (Wed, 20 Apr 2011)
New Revision: 30688
Added:
branches/jbosstools-3.2.x/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/definition/qualifier/SpiderProducer_Broken.java
Log:
JBIDE-8639
https://issues.jboss.org/browse/JBIDE-8639
Added: branches/jbosstools-3.2.x/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/definition/qualifier/SpiderProducer_Broken.java
===================================================================
--- branches/jbosstools-3.2.x/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/definition/qualifier/SpiderProducer_Broken.java (rev 0)
+++ branches/jbosstools-3.2.x/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/definition/qualifier/SpiderProducer_Broken.java 2011-04-20 21:26:22 UTC (rev 30688)
@@ -0,0 +1,31 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.jsr299.tck.tests.definition.qualifier;
+
+import javax.enterprise.inject.Produces;
+import javax.inject.Named;
+
+class SpiderProducer_Broken
+{
+
+ //method has syntax error - parameters are not closed with ')'. CDI builder should not fail.
+ @Produces @Produced @Named("tarantula") public Spider produceSpiderFromInjection(@Tame Tarantula tarantula
+ {
+ return tarantula;
+ }
+
+}
\ No newline at end of file
Property changes on: branches/jbosstools-3.2.x/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/definition/qualifier/SpiderProducer_Broken.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 11 months
JBoss Tools SVN: r30687 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test: src/org/jboss/tools/cdi/core/test/tck and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-04-20 17:25:10 -0400 (Wed, 20 Apr 2011)
New Revision: 30687
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/definition/qualifier/SpiderProducer_Broken.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ProducerMethodDefinitionTest.java
Log:
JBIDE-8639
https://issues.jboss.org/browse/JBIDE-8639
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/definition/qualifier/SpiderProducer_Broken.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/definition/qualifier/SpiderProducer_Broken.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/definition/qualifier/SpiderProducer_Broken.java 2011-04-20 21:25:10 UTC (rev 30687)
@@ -0,0 +1,31 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.jsr299.tck.tests.definition.qualifier;
+
+import javax.enterprise.inject.Produces;
+import javax.inject.Named;
+
+class SpiderProducer_Broken
+{
+
+ //method has syntax error - parameters are not closed with ')'. CDI builder should not fail.
+ @Produces @Produced @Named("tarantula") public Spider produceSpiderFromInjection(@Tame Tarantula tarantula
+ {
+ return tarantula;
+ }
+
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/definition/qualifier/SpiderProducer_Broken.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ProducerMethodDefinitionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ProducerMethodDefinitionTest.java 2011-04-20 20:36:51 UTC (rev 30686)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ProducerMethodDefinitionTest.java 2011-04-20 21:25:10 UTC (rev 30687)
@@ -10,11 +10,15 @@
******************************************************************************/
package org.jboss.tools.cdi.core.test.tck;
+import java.util.List;
import java.util.Set;
+import org.eclipse.core.resources.IFile;
import org.eclipse.jdt.core.JavaModelException;
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.IInjectionPoint;
+import org.jboss.tools.cdi.core.IParameter;
+import org.jboss.tools.cdi.core.IProducerMethod;
/**
* @author Alexey Kazakov
@@ -38,4 +42,43 @@
}
// TODO continue implementing producer tests.
+
+ public void testParameterDefinition() {
+ IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/SpiderProducer.java");
+ Set<IBean> bs = cdiProject.getBeans(file.getFullPath());
+ IProducerMethod producer = null;
+ for (IBean bean: bs) {
+ if(bean instanceof IProducerMethod) {
+ IProducerMethod m = (IProducerMethod)bean;
+ if(m.getMethod().getElementName().equals("produceSpiderFromInjection")) {
+ producer = m;
+ }
+ }
+ }
+ assertNotNull(producer);
+ List<IParameter> ps = producer.getParameters();
+ assertEquals(1, ps.size());
+ IParameter param = ps.get(0);
+ assertTrue(param.isAnnotationPresent("org.jboss.jsr299.tck.tests.definition.qualifier.Tame"));
+ }
+
+ public void testParameterDefinitionOnBrokenMethod() {
+ IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/SpiderProducer_Broken.java");
+ Set<IBean> bs = cdiProject.getBeans(file.getFullPath());
+ IProducerMethod producer = null;
+ for (IBean bean: bs) {
+ if(bean instanceof IProducerMethod) {
+ IProducerMethod m = (IProducerMethod)bean;
+ if(m.getMethod().getElementName().equals("produceSpiderFromInjection")) {
+ producer = m;
+ }
+ }
+ }
+ assertNotNull(producer);
+ List<IParameter> ps = producer.getParameters();
+ assertEquals(1, ps.size());
+ IParameter param = ps.get(0);
+ assertTrue(param.isAnnotationPresent("org.jboss.jsr299.tck.tests.definition.qualifier.Tame"));
+ }
+
}
\ No newline at end of file
14 years, 11 months
JBoss Tools SVN: r30686 - trunk/as/tests/org.jboss.ide.eclipse.as.test.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-04-20 16:36:51 -0400 (Wed, 20 Apr 2011)
New Revision: 30686
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.test/pom.xml
Log:
for rawbdor, support passing in jbosstools.test.jboss.home.3.2 to maven and having that pass through to tests by externalizing these vars as maven properties
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/pom.xml
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/pom.xml 2011-04-20 20:25:15 UTC (rev 30685)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/pom.xml 2011-04-20 20:36:51 UTC (rev 30686)
@@ -12,7 +12,12 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <systemProperties>-Djbosstools.test.jboss.home.3.2=${requirement.build.root}/jboss-3.2.8.SP1 -Djbosstools.test.jboss.home.4.0=${requirement.build.root}/jboss-4.0.5.GA -Djbosstools.test.jboss.home.4.2=${requirement.build.root}/jboss-4.2.3.GA -Djbosstools.test.jboss.home.5.0=${requirement.build.root}/jboss-5.0.1.GA -Djbosstools.test.jboss.home.5.1=${requirement.build.root}/jboss-5.1.0.GA</systemProperties>
+ <jbosstools.test.jboss.home.3.2>${requirement.build.root}/jboss-3.2.8.SP1</jbosstools.test.jboss.home.3.2>
+ <jbosstools.test.jboss.home.4.0>${requirement.build.root}/jboss-4.0.5.GA</jbosstools.test.jboss.home.4.0>
+ <jbosstools.test.jboss.home.4.2>${requirement.build.root}/jboss-4.2.3.GA</jbosstools.test.jboss.home.4.2>
+ <jbosstools.test.jboss.home.5.0>${requirement.build.root}/jboss-5.0.1.GA</jbosstools.test.jboss.home.5.0>
+ <jbosstools.test.jboss.home.5.1>${requirement.build.root}/jboss-5.1.0.GA</jbosstools.test.jboss.home.5.1>
+ <systemProperties>-Djbosstools.test.jboss.home.3.2=${jbosstools.test.jboss.home.3.2} -Djbosstools.test.jboss.home.4.0=${jbosstools.test.jboss.home.4.0} -Djbosstools.test.jboss.home.4.2=${jbosstools.test.jboss.home.4.2} -Djbosstools.test.jboss.home.5.0=${jbosstools.test.jboss.home.5.0} -Djbosstools.test.jboss.home.5.1=${jbosstools.test.jboss.home.5.1}</systemProperties>
<emma.filter>org.jboss.ide.eclipse.as.core*</emma.filter>
<emma.instrument.bundles>org.jboss.ide.eclipse.as.core</emma.instrument.bundles>
</properties>
14 years, 11 months
JBoss Tools SVN: r30685 - branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-04-20 16:25:15 -0400 (Wed, 20 Apr 2011)
New Revision: 30685
Modified:
branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/MethodDefinition.java
Log:
JBIDE-8639
https://issues.jboss.org/browse/JBIDE-8639
Modified: branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/MethodDefinition.java
===================================================================
--- branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/MethodDefinition.java 2011-04-20 20:22:55 UTC (rev 30684)
+++ branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/MethodDefinition.java 2011-04-20 20:25:15 UTC (rev 30685)
@@ -84,7 +84,7 @@
int declEnd = content.indexOf('{', paramStart);
if(declEnd < 0) return;
int paramEnd = content.lastIndexOf(')', declEnd);
- if(paramEnd < 0) return;
+ if(paramEnd < paramStart) paramEnd = declEnd;
String paramsString = content.substring(paramStart + 1, paramEnd);
if(!parametersAreInjectionPoints && paramsString.indexOf("@Observes") >= 0) {
parametersAreInjectionPoints = true;
14 years, 11 months