JBoss Tools SVN: r30461 - in trunk/maven/plugins: org.jboss.tools.maven.hibernate and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-04-10 18:58:49 -0400 (Sun, 10 Apr 2011)
New Revision: 30461
Modified:
trunk/maven/plugins/org.jboss.tools.maven.cdi/plugin.properties
trunk/maven/plugins/org.jboss.tools.maven.hibernate/plugin.properties
trunk/maven/plugins/org.jboss.tools.maven.jsf/plugin.properties
trunk/maven/plugins/org.jboss.tools.maven.portlet/plugin.properties
trunk/maven/plugins/org.jboss.tools.maven.seam/plugin.properties
trunk/maven/plugins/org.jboss.tools.maven.seam/plugin.xml
Log:
JBIDE-8707 maven configurators have redundant names
Modified: trunk/maven/plugins/org.jboss.tools.maven.cdi/plugin.properties
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.cdi/plugin.properties 2011-04-10 22:58:24 UTC (rev 30460)
+++ trunk/maven/plugins/org.jboss.tools.maven.cdi/plugin.properties 2011-04-10 22:58:49 UTC (rev 30461)
@@ -1,4 +1,4 @@
Bundle-Vendor = JBoss by Red Hat
Bundle-Name = JBoss Maven CDI Configurator
-CDI_Project_configurator_WTP = CDI Project configurator (WTP)
-CDI_Project_configurator_JDT = CDI Project configurator (JDT)
+CDI_Project_configurator_WTP = CDI (WTP)
+CDI_Project_configurator_JDT = CDI (JDT)
Modified: trunk/maven/plugins/org.jboss.tools.maven.hibernate/plugin.properties
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.hibernate/plugin.properties 2011-04-10 22:58:24 UTC (rev 30460)
+++ trunk/maven/plugins/org.jboss.tools.maven.hibernate/plugin.properties 2011-04-10 22:58:49 UTC (rev 30461)
@@ -1,4 +1,4 @@
Bundle-Vendor = JBoss by Red Hat
Bundle-Name = JBoss Maven Hibernate Configurator
-Hibernate_Project_configurator = Hibernate Project configurator
+Hibernate_Project_configurator = Hibernate
Modified: trunk/maven/plugins/org.jboss.tools.maven.jsf/plugin.properties
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.jsf/plugin.properties 2011-04-10 22:58:24 UTC (rev 30460)
+++ trunk/maven/plugins/org.jboss.tools.maven.jsf/plugin.properties 2011-04-10 22:58:49 UTC (rev 30461)
@@ -1,3 +1,3 @@
Bundle-Vendor = JBoss by Red Hat
Bundle-Name = JBoss Maven JSF Configurator
-JSF_Project_configurator = JSF Project configurator
+JSF_Project_configurator = JSF
Modified: trunk/maven/plugins/org.jboss.tools.maven.portlet/plugin.properties
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.portlet/plugin.properties 2011-04-10 22:58:24 UTC (rev 30460)
+++ trunk/maven/plugins/org.jboss.tools.maven.portlet/plugin.properties 2011-04-10 22:58:49 UTC (rev 30461)
@@ -1,3 +1,3 @@
Bundle-Vendor = JBoss by Red Hat
Bundle-Name = JBoss Maven Portlet Configurator
-Portlet_Project_configurator = Portlet Project configurator
+Portlet_Project_configurator = Portlet
Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/plugin.properties
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.seam/plugin.properties 2011-04-10 22:58:24 UTC (rev 30460)
+++ trunk/maven/plugins/org.jboss.tools.maven.seam/plugin.properties 2011-04-10 22:58:49 UTC (rev 30461)
@@ -1,4 +1,5 @@
#Properties file for org.jboss.tools.maven.seam
Bundle-Vendor = JBoss by Red Hat
Bundle-Name = Integration Seam projects with Maven
-Seam_Project_configurator = Seam Project configurator
\ No newline at end of file
+Seam_Project_configurator = Seam
+Fix_classpath = Fixing classpath
\ No newline at end of file
Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/plugin.xml
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.seam/plugin.xml 2011-04-10 22:58:24 UTC (rev 30460)
+++ trunk/maven/plugins/org.jboss.tools.maven.seam/plugin.xml 2011-04-10 22:58:49 UTC (rev 30461)
@@ -30,9 +30,9 @@
<extension point="org.eclipse.m2e.core.projectConfigurators">
<configurator
- id="org.jboss.tools.maven.seam.configurator.fixClasspathConfigurator"
+ id="org.jboss.tools.maven.seam.configuringator.fixClasspathConfigurator"
class="org.jboss.tools.maven.seam.configurators.FixClasspathConfigurator"
- name="%Seam_Project_configurator"
+ name="%Fix_classpath"
secondaryTo="org.eclipse.m2e.jdt.javaConfigurator"/>
</extension>
13 years, 6 months
JBoss Tools SVN: r30460 - in branches/jbosstools-3.2.x/maven/plugins: org.jboss.tools.maven.hibernate and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-04-10 18:58:24 -0400 (Sun, 10 Apr 2011)
New Revision: 30460
Modified:
branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.cdi/plugin.properties
branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.hibernate/plugin.properties
branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.jsf/plugin.properties
branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.portlet/plugin.properties
branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.seam/plugin.properties
branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.seam/plugin.xml
Log:
JBIDE-8707 maven configurators have redundant names
Modified: branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.cdi/plugin.properties
===================================================================
--- branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.cdi/plugin.properties 2011-04-09 17:58:42 UTC (rev 30459)
+++ branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.cdi/plugin.properties 2011-04-10 22:58:24 UTC (rev 30460)
@@ -1,3 +1,3 @@
Bundle-Vendor = JBoss by Red Hat
Bundle-Name = JBoss Maven CDI Configurator
-CDI_Project_configurator = CDI Project configurator
+CDI_Project_configurator = CDI
Modified: branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.hibernate/plugin.properties
===================================================================
--- branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.hibernate/plugin.properties 2011-04-09 17:58:42 UTC (rev 30459)
+++ branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.hibernate/plugin.properties 2011-04-10 22:58:24 UTC (rev 30460)
@@ -1,4 +1,4 @@
Bundle-Vendor = JBoss by Red Hat
Bundle-Name = JBoss Maven Hibernate Configurator
-Hibernate_Project_configurator = Hibernate Project configurator
+Hibernate_Project_configurator = Hibernate
Modified: branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.jsf/plugin.properties
===================================================================
--- branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.jsf/plugin.properties 2011-04-09 17:58:42 UTC (rev 30459)
+++ branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.jsf/plugin.properties 2011-04-10 22:58:24 UTC (rev 30460)
@@ -1,3 +1,3 @@
Bundle-Vendor = JBoss by Red Hat
Bundle-Name = JBoss Maven JSF Configurator
-JSF_Project_configurator = JSF Project configurator
+JSF_Project_configurator = JSF
Modified: branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.portlet/plugin.properties
===================================================================
--- branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.portlet/plugin.properties 2011-04-09 17:58:42 UTC (rev 30459)
+++ branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.portlet/plugin.properties 2011-04-10 22:58:24 UTC (rev 30460)
@@ -1,3 +1,3 @@
Bundle-Vendor = JBoss by Red Hat
Bundle-Name = JBoss Maven Portlet Configurator
-Portlet_Project_configurator = Portlet Project configurator
+Portlet_Project_configurator = Portlet
Modified: branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.seam/plugin.properties
===================================================================
--- branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.seam/plugin.properties 2011-04-09 17:58:42 UTC (rev 30459)
+++ branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.seam/plugin.properties 2011-04-10 22:58:24 UTC (rev 30460)
@@ -1,4 +1,5 @@
#Properties file for org.jboss.tools.maven.seam
Bundle-Vendor = JBoss by Red Hat
Bundle-Name = Integration Seam projects with Maven
-Seam_Project_configurator = Seam Project configurator
\ No newline at end of file
+Seam_Project_configurator = Seam
+Fix_classpath = Fixing classpath
\ No newline at end of file
Modified: branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.seam/plugin.xml
===================================================================
--- branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.seam/plugin.xml 2011-04-09 17:58:42 UTC (rev 30459)
+++ branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.seam/plugin.xml 2011-04-10 22:58:24 UTC (rev 30460)
@@ -18,7 +18,7 @@
<configurator
id="org.jboss.tools.maven.seam.configurator.fixClasspathConfigurator"
class="org.jboss.tools.maven.seam.configurators.FixClasspathConfigurator"
- name="%Seam_Project_configurator" priority="300"/>
+ name="%Fix_classpath" priority="300"/>
</extension>
13 years, 6 months
JBoss Tools SVN: r30459 - in trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator: helpers and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: bbrodt
Date: 2011-04-09 13:58:42 -0400 (Sat, 09 Apr 2011)
New Revision: 30459
Modified:
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/EmfModelQuery.java
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/helpers/ModelQueryImpl.java
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/IModelQuery.java
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ProcessValidator.java
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/messages.properties
Log:
https://issues.jboss.org/browse/JBIDE-8088
added missing functionality to validate conflicting XSD definitions
Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/EmfModelQuery.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/EmfModelQuery.java 2011-04-09 13:15:17 UTC (rev 30458)
+++ trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/EmfModelQuery.java 2011-04-09 17:58:42 UTC (rev 30459)
@@ -10,6 +10,7 @@
*******************************************************************************/
package org.eclipse.bpel.validator;
+import java.util.ArrayList;
import java.util.List;
import javax.xml.XMLConstants;
@@ -457,9 +458,10 @@
*
* @param eObj
* @return the root object
+ * @see https://issues.jboss.org/browse/JBIDE-8088 - made public
*/
@SuppressWarnings("nls")
- static EObject getRoot ( EObject eObj ) {
+ public static EObject getRoot ( EObject eObj ) {
assertTrue(eObj != null, CONTEXT_MSG );
EObject top = eObj;
@@ -503,6 +505,39 @@
return null;
}
+ /**
+ * Search all process imports for the given QName reference
+ *
+ * @param process
+ * @param qname
+ * @param refType
+ * @return list of Imports
+ * @see https://issues.jboss.org/browse/JBIDE-8088 - added
+ */
+ public static List<Import> scanAllImports ( Process process, QName qname , String refType ) {
+
+ List<Import> imports = new ArrayList<Import>();
+ EObject result = null;
+
+ for(Object n : process.getImports()) {
+ Import imp = (Import) n;
+ if (imp.getLocation() == null ) {
+ continue;
+ }
+
+ ImportResolver[] resolvers = ImportResolverRegistry.INSTANCE.getResolvers(imp.getImportType());
+ for(ImportResolver r : resolvers) {
+ result = r.resolve(imp, qname, null, refType);
+ if (result != null) {
+ imports.add(imp);
+ }
+ }
+
+ }
+
+ return imports;
+ }
+
public static EObject resolveProxy( Process process, EObject obj) {
if (obj instanceof MessageProxy) {
return scanImports ( process, ((MessageProxy)obj).getQName(), WSDLUtil.WSDL_MESSAGE );
Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/helpers/ModelQueryImpl.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/helpers/ModelQueryImpl.java 2011-04-09 13:15:17 UTC (rev 30458)
+++ trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/helpers/ModelQueryImpl.java 2011-04-09 17:58:42 UTC (rev 30459)
@@ -15,10 +15,14 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
+import java.util.List;
import java.util.Stack;
import javax.xml.namespace.QName;
+import org.eclipse.bpel.model.Import;
+import org.eclipse.bpel.model.Process;
+import org.eclipse.bpel.model.util.XSDUtil;
import org.eclipse.bpel.validator.EmfModelQuery;
import org.eclipse.bpel.validator.model.Filters;
import org.eclipse.bpel.validator.model.IConstants;
@@ -31,6 +35,9 @@
import org.eclipse.bpel.validator.model.Selector;
import org.eclipse.bpel.validator.model.UndefinedNode;
import org.eclipse.bpel.validator.model.XNotImplemented;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.xsd.XSDElementDeclaration;
+import org.eclipse.xsd.XSDTypeDefinition;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -957,6 +964,81 @@
return gModelQuery;
}
+ /**
+ * Searches all imports in the given Process for conflicting XSD definitions
+ *
+ * @param process the containing Process
+ * @param node the XSD element reference
+ * @return the list of Imports that contain conflicting definitions or null
+ * if there are no conflicts.
+ * @see https://issues.jboss.org/browse/JBIDE-8088
+ */
+ @Override
+ public List<Import> findConflictingXSD(Process process, INode node) {
+
+ EObject o1 = adapt(node, EObject.class, ADAPT_HINT_NONE);
+ List<Import> imports = null;
+ List<Import> conflicts = new ArrayList<Import>();
+ QName qname = null;
+
+ if (o1 instanceof XSDTypeDefinition) {
+ qname = this.createQName(node, ((XSDTypeDefinition) o1).getName());
+ if ("".equals(qname.getNamespaceURI())) {
+ qname = new QName(((XSDTypeDefinition) o1).getTargetNamespace(), qname.getLocalPart());
+ }
+ imports = emfModelQuery.scanAllImports(process, qname, XSDUtil.XSD_TYPE_DEFINITION);
+ } else if (o1 instanceof XSDElementDeclaration) {
+ qname = this.createQName(node, ((XSDElementDeclaration) o1).getName());
+ if ("".equals(qname.getNamespaceURI())) {
+ qname = new QName(((XSDElementDeclaration) o1).getTargetNamespace(), qname.getLocalPart());
+ }
+ imports = emfModelQuery.scanAllImports(process, qname, XSDUtil.XSD_ELEMENT_DECLARATION);
+ }
+
+ if (imports != null && imports.size() > 1) {
+ EObject o2 = null;
+ o1 = null;
+ for (Import imp : imports) {
+ EObject resolvedImport = emfModelQuery.lookupImport(imp, null);
+ if (o1 == null) {
+ if (o1 instanceof XSDTypeDefinition) {
+ o1 = emfModelQuery.lookupXSDType(resolvedImport, qname);
+ } else {
+ o1 = emfModelQuery.lookupXSDElement(resolvedImport, qname);
+ }
+ conflicts.add(imp);
+ } else {
+ if (o2 instanceof XSDTypeDefinition) {
+ o2 = emfModelQuery.lookupXSDType(resolvedImport, qname);
+ } else {
+ o2 = emfModelQuery.lookupXSDElement(resolvedImport, qname);
+ }
+ if (!emfModelQuery.compatibleType(o1, o2)) {
+ conflicts.add(imp);
+ }
+ }
+ }
+ }
+
+ return conflicts.size()>1 ? conflicts : null;
+ }
+
+
+ /**
+ * Returns the Process that corresponds to the given node
+ *
+ * @param node the Process element
+ * @return the Process or null
+ * @see https://issues.jboss.org/browse/JBIDE-8088
+ */
+ @Override
+ public Process lookupProcess(INode node) {
+ EObject root = emfModelQuery.getRoot( adapt(node, EObject.class, ADAPT_HINT_NONE) );
+ if (root instanceof Process)
+ return (Process) root;
+ return null;
+ }
+
}
Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/IModelQuery.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/IModelQuery.java 2011-04-09 13:15:17 UTC (rev 30458)
+++ trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/IModelQuery.java 2011-04-09 17:58:42 UTC (rev 30459)
@@ -10,8 +10,13 @@
*******************************************************************************/
package org.eclipse.bpel.validator.model;
+import java.util.List;
+
import javax.xml.namespace.QName;
+import org.eclipse.bpel.model.Import;
+import org.eclipse.bpel.model.Process;
+
/**
* This interface represents the query interface that the validator uses to ask
* of items in the model.
@@ -166,4 +171,23 @@
public QName createQName ( INode context, String name ) ;
+ /**
+ * Searches all imports in the given Process for conflicting XSD definitions
+ *
+ * @param process the containing Process
+ * @param node the XSD element reference
+ * @return the list of Imports that contain conflicting definitions or null
+ * if there are no conflicts.
+ * @see https://issues.jboss.org/browse/JBIDE-8088
+ */
+ public List<Import> findConflictingXSD(Process process, INode node);
+
+ /**
+ * Returns the Process that corresponds to the given node
+ *
+ * @param node the Process element
+ * @return the Process or null
+ * @see https://issues.jboss.org/browse/JBIDE-8088
+ */
+ public Process lookupProcess(INode node);
}
Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ProcessValidator.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ProcessValidator.java 2011-04-09 13:15:17 UTC (rev 30458)
+++ trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/ProcessValidator.java 2011-04-09 17:58:42 UTC (rev 30459)
@@ -20,6 +20,11 @@
import java.util.LinkedList;
import java.util.List;
+import javax.xml.namespace.QName;
+
+import org.eclipse.bpel.model.Import;
+import org.eclipse.bpel.model.Process;
+import org.eclipse.bpel.validator.helpers.DOMNodeAdapter;
import org.eclipse.bpel.validator.model.Filters;
import org.eclipse.bpel.validator.model.IConstants;
import org.eclipse.bpel.validator.model.IModelQueryLookups;
@@ -27,6 +32,10 @@
import org.eclipse.bpel.validator.model.IProblem;
import org.eclipse.bpel.validator.model.ARule;
import org.eclipse.bpel.validator.model.NodeAttributeValueFilter;
+import org.eclipse.emf.ecore.EObject;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
@@ -348,13 +357,33 @@
tag = "pass2",
order = 300
)
-
+ // https://issues.jboss.org/browse/JBIDE-8088
+ // implemented missing code
public void CheckReferencedTypes () {
- // TODO: Add support for that in the model query mechanism.
+ IProblem problem;
+
for(INode node : fTypeToCheckList) {
- //if (mModelQuery.check(IModelQueryLookups.TEST_CONFLICTING_XSD, node, null)) {
- //
- //}
+
+ Process process = (Process) mModelQuery.lookupProcess(mNode);
+ List<Import> conflicts = mModelQuery.findConflictingXSD(process, node);
+ if (conflicts!=null) {
+
+ String conflicting = null;
+ for (int i=1; i<conflicts.size(); ++i) {
+ if (conflicting == null)
+ conflicting = conflicts.get(i).getLocation();
+ else
+ conflicting += ", " + conflicts.get(i).getLocation();
+ }
+ problem = createError(node);
+ problem.fill("BPELC_XSD__CONFLICTING_DEFINITION",
+ node.getAttribute(AT_NAME),
+ conflicts.get(0).getLocation(),
+ conflicting
+
+ );
+
+ }
}
}
Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/messages.properties
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/messages.properties 2011-04-09 13:15:17 UTC (rev 30458)
+++ trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/messages.properties 2011-04-09 17:58:42 UTC (rev 30459)
@@ -847,7 +847,18 @@
compatible with {4} "{5}" of type "{6}"
BPELC_XSD__INCOMPATIBLE_TYPE.fix = Type must be compatible.
#
+# ------------- Conflicting XSD type definitions ---------------------
+# BPELC_UNKNOWN__ELEMENT
+# {0}: node
+# {1}: namespace URI
#
+# https://issues.jboss.org/browse/JBIDE-8088
+BPELC_XSD__CONFLICTING_DEFINITION.summary = Conflicting XSD element <{0}> definitions.
+BPELC_XSD__CONFLICTING_DEFINITION = XSD element <{0}> in import {1} conflicts with element of the same name in {2}.
+BPELC_XSD__CONFLICTING_DEFINITION.fix = Resolve the conflict by removing the conflicting definitions, or ensuring that all definitions are identical.
+
+#
+#
# -------------------- Copy ------------------------------------
# BPELC_COPY__INCOMPATIBLE
# {0}: node
13 years, 6 months
JBoss Tools SVN: r30458 - workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-04-09 09:15:17 -0400 (Sat, 09 Apr 2011)
New Revision: 30458
Added:
workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentBuilderIntegrationTest.java
Removed:
workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentBuilderTest.java
Log:
[JBIDE-8690] added tests for deployed artifacts (name, status)
Copied: workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentBuilderIntegrationTest.java (from rev 30455, workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentBuilderTest.java)
===================================================================
--- workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentBuilderIntegrationTest.java (rev 0)
+++ workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentBuilderIntegrationTest.java 2011-04-09 13:15:17 UTC (rev 30458)
@@ -0,0 +1,92 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are 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 Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.jboss.ide.eclipse.as7.deployment.tests;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.fail;
+import static org.junit.Assert.*;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.ConnectException;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.UnknownHostException;
+import java.util.List;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Platform;
+import org.jboss.ide.eclipse.as7.deployment.DeploymentBuilder;
+import org.jboss.ide.eclipse.as7.deployment.DeploymentBuilder.Deployable;
+import org.jboss.ide.eclipse.as7.deployment.DeploymentBuilderException;
+import org.junit.Before;
+import org.junit.Test;
+import org.osgi.framework.Bundle;
+
+/**
+ * @author André Dietisheim
+ */
+public class DeploymentBuilderIntegrationTest {
+
+ private static final String WAR_FOLDER = "wars/";
+
+ private static final String BUNDLE_ID = "org.jboss.ide.eclipse.as7.deployment.tests";
+
+ private static final String HOST = "localhost";
+ private static final int PORT = 9999;
+
+ @Before
+ public void setUp() throws UnknownHostException, IOException {
+ assertAs7IsRunning();
+ }
+
+ private void assertAs7IsRunning() throws UnknownHostException, IOException {
+ try {
+ Socket socket = new Socket();
+ socket.connect(new InetSocketAddress(HOST, PORT));
+ socket.close();
+ } catch (ConnectException e) {
+ fail("JBoss as7 seems not to run on " + HOST + ", test cannot access it's management API on port " + PORT);
+ }
+ }
+
+ @Test
+ public void canDeploy() throws DeploymentBuilderException, URISyntaxException, IOException {
+ File file = getWarFile("minimalistic.war");
+ new DeploymentBuilder(HOST, PORT).add(file).deploy();
+ }
+
+ @Test
+ public void getMatchingDeployables() throws DeploymentBuilderException, URISyntaxException, IOException {
+ String warName = "minimalistic.war";
+ File file = getWarFile(warName );
+ List<Deployable> deployables = new DeploymentBuilder(HOST, PORT).add(file).deploy();
+ assertEquals(1, deployables.size());
+ assertEquals(warName, deployables.get(0).getName());
+ }
+
+ @Test
+ public void canGetDeploymentStatus() throws DeploymentBuilderException, URISyntaxException, IOException {
+ File file = getWarFile("minimalistic.war");
+ List<Deployable> deployables = new DeploymentBuilder(HOST, PORT).add(file).deploy();
+ Deployable deployable = deployables.get(0);
+ assertNotNull(deployable.getStatus());
+ }
+
+
+ private File getWarFile(String name) throws URISyntaxException, IOException {
+ Bundle bundle = Platform.getBundle(BUNDLE_ID);
+ URL entryUrl = bundle.getEntry(WAR_FOLDER + name);
+ return new File(FileLocator.resolve(entryUrl).toURI());
+ }
+}
Property changes on: workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentBuilderIntegrationTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentBuilderTest.java
===================================================================
--- workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentBuilderTest.java 2011-04-09 12:52:44 UTC (rev 30457)
+++ workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentBuilderTest.java 2011-04-09 13:15:17 UTC (rev 30458)
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Red Hat Inc..
- * All rights reserved. This program and the accompanying materials
- * are 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 Incorporated - initial API and implementation
- *******************************************************************************/
-package org.jboss.ide.eclipse.as7.deployment.tests;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.net.UnknownHostException;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-import org.jboss.ide.eclipse.as7.deployment.DeploymentBuilder;
-import org.jboss.ide.eclipse.as7.deployment.DeploymentBuilderException;
-import org.junit.Before;
-import org.junit.Test;
-import org.osgi.framework.Bundle;
-
-import static junit.framework.Assert.assertTrue;
-
-/**
- * @author André Dietisheim
- */
-public class DeploymentBuilderTest {
-
- private static final String WAR_FOLDER = "wars/";
-
- private static final String BUNDLE_ID = "org.jboss.ide.eclipse.as7.deployment.tests";
-
- private static final String HOST = "localhost";
- private static final int PORT = 9999;
-
- @Before
- public void setUp() throws UnknownHostException, IOException {
- assertAs7IsRunning();
- }
-
- private void assertAs7IsRunning() throws UnknownHostException, IOException {
- Socket socket = new Socket();
- socket.connect(new InetSocketAddress(HOST, PORT));
- assertTrue(socket.isConnected());
- socket.close();
- }
-
- @Test
- public void canDeploy() throws DeploymentBuilderException, URISyntaxException, IOException {
- File file = getWarFile("minimalistic.war");
- new DeploymentBuilder(HOST, PORT).add(file).deploy();
- }
-
- private File getWarFile(String name) throws URISyntaxException, IOException {
- Bundle bundle = Platform.getBundle(BUNDLE_ID);
- URL entryUrl = bundle.getEntry(WAR_FOLDER + name);
- return new File(FileLocator.resolve(entryUrl).toURI());
-
- }
-}
13 years, 6 months
JBoss Tools SVN: r30457 - workspace/adietish/org.jboss.ide.eclipse.as7.deployment/src/org/jboss/ide/eclipse/as7/deployment.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-04-09 08:52:44 -0400 (Sat, 09 Apr 2011)
New Revision: 30457
Modified:
workspace/adietish/org.jboss.ide.eclipse.as7.deployment/src/org/jboss/ide/eclipse/as7/deployment/DeploymentBuilder.java
Log:
[JBIDE-8690] added source jar for jboss-controller-client
Modified: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/src/org/jboss/ide/eclipse/as7/deployment/DeploymentBuilder.java
===================================================================
--- workspace/adietish/org.jboss.ide.eclipse.as7.deployment/src/org/jboss/ide/eclipse/as7/deployment/DeploymentBuilder.java 2011-04-09 12:51:12 UTC (rev 30456)
+++ workspace/adietish/org.jboss.ide.eclipse.as7.deployment/src/org/jboss/ide/eclipse/as7/deployment/DeploymentBuilder.java 2011-04-09 12:52:44 UTC (rev 30457)
@@ -71,17 +71,15 @@
}
try {
- try {
- addWarFiles(builder, deployables);
- DeploymentPlan plan = builder.build();
- Future<ServerDeploymentPlanResult> planResult = manager.execute(plan);
- setResult(planResult, deployables);
- return deployables;
- } finally {
- cleanup();
- }
+ addWarFiles(builder, deployables);
+ DeploymentPlan plan = builder.build();
+ Future<ServerDeploymentPlanResult> planResult = manager.execute(plan);
+ setResult(planResult, deployables);
+ return deployables;
} catch (Exception e) {
throw new DeploymentBuilderException(e);
+ } finally {
+ cleanup();
}
}
13 years, 6 months
JBoss Tools SVN: r30456 - workspace/adietish/org.jboss.ide.eclipse.as7.deployment.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-04-09 08:51:12 -0400 (Sat, 09 Apr 2011)
New Revision: 30456
Added:
workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-controller-client-7.0.0.Beta3-SNAPSHOT-sources.jar
Modified:
workspace/adietish/org.jboss.ide.eclipse.as7.deployment/.classpath
Log:
[JBIDE-8690] added source jar for jboss-controller-client
Modified: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/.classpath
===================================================================
--- workspace/adietish/org.jboss.ide.eclipse.as7.deployment/.classpath 2011-04-09 12:19:45 UTC (rev 30455)
+++ workspace/adietish/org.jboss.ide.eclipse.as7.deployment/.classpath 2011-04-09 12:51:12 UTC (rev 30456)
@@ -5,7 +5,7 @@
<classpathentry exported="true" kind="lib" path="jboss-threads-2.0.0.CR8.jar"/>
<classpathentry exported="true" kind="lib" path="shrinkwrap-api-1.0.0-alpha-11.jar"/>
<classpathentry exported="true" kind="lib" path="jboss-dmr-1.0.0.Beta5.jar"/>
- <classpathentry exported="true" kind="lib" path="jboss-as-controller-client-7.0.0.Beta3-SNAPSHOT.jar" sourcepath="/home/adietish/jboss-workspaces/jboss-tools/jbosstools-src/jboss-as"/>
+ <classpathentry exported="true" kind="lib" path="jboss-as-controller-client-7.0.0.Beta3-SNAPSHOT.jar" sourcepath="jboss-as-controller-client-7.0.0.Beta3-SNAPSHOT-sources.jar"/>
<classpathentry exported="true" kind="lib" path="jboss-as-protocol-7.0.0.Beta3-SNAPSHOT.jar"/>
<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"/>
Added: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-controller-client-7.0.0.Beta3-SNAPSHOT-sources.jar
===================================================================
(Binary files differ)
Property changes on: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-controller-client-7.0.0.Beta3-SNAPSHOT-sources.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
13 years, 6 months
JBoss Tools SVN: r30455 - workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-04-09 08:19:45 -0400 (Sat, 09 Apr 2011)
New Revision: 30455
Modified:
workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentBuilderTest.java
Log:
[JBIDE-8690]
Modified: workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentBuilderTest.java
===================================================================
--- workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentBuilderTest.java 2011-04-09 00:10:13 UTC (rev 30454)
+++ workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentBuilderTest.java 2011-04-09 12:19:45 UTC (rev 30455)
@@ -21,6 +21,7 @@
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Platform;
import org.jboss.ide.eclipse.as7.deployment.DeploymentBuilder;
+import org.jboss.ide.eclipse.as7.deployment.DeploymentBuilderException;
import org.junit.Before;
import org.junit.Test;
import org.osgi.framework.Bundle;
@@ -52,7 +53,7 @@
}
@Test
- public void canDeploy() throws URISyntaxException, IOException {
+ public void canDeploy() throws DeploymentBuilderException, URISyntaxException, IOException {
File file = getWarFile("minimalistic.war");
new DeploymentBuilder(HOST, PORT).add(file).deploy();
}
13 years, 6 months
JBoss Tools SVN: r30454 - trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-04-08 20:10:13 -0400 (Fri, 08 Apr 2011)
New Revision: 30454
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/ExactTest.java
Log:
JBIDE-8198
https://issues.jboss.org/browse/JBIDE-8198
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/ExactTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/ExactTest.java 2011-04-09 00:06:15 UTC (rev 30453)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/ExactTest.java 2011-04-09 00:10:13 UTC (rev 30454)
@@ -42,7 +42,7 @@
JobUtils.waitForIdle();
}
- public void testVeto() throws CoreException, IOException {
+ public void testExact() throws CoreException, IOException {
ICDIProject cdi = CDICorePlugin.getCDIProject(project, true);
Set<IBean> bs = cdi.getBeans(new Path("/CDISolderTest/src/org/jboss/exact/FishFactory.java"));
@@ -84,43 +84,6 @@
assertEquals(3, count);
}
- public void testRequires() throws CoreException, IOException {
- ICDIProject cdi = CDICorePlugin.getCDIProject(project, true);
-
- //1. class annotated @Requires that references single non-available class
- TypeDefinition d = cdi.getNature().getDefinitions().getTypeDefinition("org.jboss.requires.Bear");
- assertNotNull(d); //Though there exists Java type Bear
- IAnnotationDeclaration a = d.getAnnotation(CDIConstants.NAMED_QUALIFIER_TYPE_NAME);
- assertNotNull(a);
- Object name = a.getMemberValue(null);
- assertEquals("bear", name); //...and it is annotated with @Named("bear")
- Set<IBean> bs = cdi.getBeans("bear", false);
- assertTrue(bs.isEmpty()); //...CDI model does not have a bean named "bear"
- bs = cdi.getBeans(d.getResource().getFullPath());
- assertTrue(bs.isEmpty()); //...and does not loaded any beans form its resource
-
- //2. class annotated @Requires that references array of classes some of which are not available
- d = cdi.getNature().getDefinitions().getTypeDefinition("org.jboss.requires.Bee");
- assertNotNull(d); //Though there exists Java type Bee
- a = d.getAnnotation(CDIConstants.NAMED_QUALIFIER_TYPE_NAME);
- assertNotNull(a);
- name = a.getMemberValue(null);
- assertEquals("bee", name); //...and it is annotated with @Named("bee")
- bs = cdi.getBeans("bee", false);
- assertTrue(bs.isEmpty()); //...CDI model does not have a bean named "bee"
- bs = cdi.getBeans(d.getResource().getFullPath());
- assertTrue(bs.isEmpty()); //...and does not loaded any beans form its resource
-
- //3. class annotated @Requires that references single available class
- bs = cdi.getBeans("fly", false);
- assertEquals(1, bs.size()); //...CDI model has a bean named "fly"
-
- //4. class annotated @Requires that references array of available classes
- bs = cdi.getBeans("dragonfly", false);
- assertEquals(1, bs.size()); //...CDI model has a bean named "dragonfly"
-
- }
-
public void tearDown() throws Exception {
boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
JobUtils.waitForIdle();
13 years, 6 months
JBoss Tools SVN: r30453 - 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-08 20:06:15 -0400 (Fri, 08 Apr 2011)
New Revision: 30453
Modified:
branches/jbosstools-3.2.x/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BuiltInBeanInjectionTest.java
Log:
JBIDE-8697
https://issues.jboss.org/browse/JBIDE-8697
Modified: branches/jbosstools-3.2.x/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BuiltInBeanInjectionTest.java
===================================================================
--- branches/jbosstools-3.2.x/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BuiltInBeanInjectionTest.java 2011-04-09 00:04:53 UTC (rev 30452)
+++ branches/jbosstools-3.2.x/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BuiltInBeanInjectionTest.java 2011-04-09 00:06:15 UTC (rev 30453)
@@ -12,23 +12,10 @@
import java.util.Set;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jdt.core.IClassFile;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.compiler.IProblem;
-import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.core.IBean;
-import org.jboss.tools.cdi.core.IInjectionPoint;
import org.jboss.tools.cdi.core.IInjectionPointField;
-import org.jboss.tools.cdi.core.IInjectionPointParameter;
-import org.jboss.tools.cdi.core.IObserverMethod;
-import org.jboss.tools.cdi.core.IParameter;
-import org.jboss.tools.cdi.core.IQualifier;
import org.jboss.tools.cdi.internal.core.impl.BuiltInBean;
-import org.jboss.tools.common.model.util.EclipseJavaUtil;
-import org.jboss.tools.common.model.util.EclipseResourceUtil;
/**
* @author Viacheslav Kabanovich
@@ -40,9 +27,6 @@
IInjectionPointField field = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/implementation/builtin/UserTransactionInjectedBean.java", "userTransaction");
assertNotNull(field);
- IProject p = cdiProject.getNature().getProject();
- IJavaProject jp = EclipseResourceUtil.getJavaProject(p);
-
Set<IBean> beans = field.getCDIProject().getBeans(false, field);
assertFalse(beans.isEmpty());
13 years, 6 months
JBoss Tools SVN: r30452 - trunk/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-08 20:04:53 -0400 (Fri, 08 Apr 2011)
New Revision: 30452
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BuiltInBeanInjectionTest.java
Log:
JBIDE-8697
https://issues.jboss.org/browse/JBIDE-8697
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BuiltInBeanInjectionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BuiltInBeanInjectionTest.java 2011-04-09 00:03:52 UTC (rev 30451)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BuiltInBeanInjectionTest.java 2011-04-09 00:04:53 UTC (rev 30452)
@@ -12,23 +12,10 @@
import java.util.Set;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jdt.core.IClassFile;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.compiler.IProblem;
-import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.core.IBean;
-import org.jboss.tools.cdi.core.IInjectionPoint;
import org.jboss.tools.cdi.core.IInjectionPointField;
-import org.jboss.tools.cdi.core.IInjectionPointParameter;
-import org.jboss.tools.cdi.core.IObserverMethod;
-import org.jboss.tools.cdi.core.IParameter;
-import org.jboss.tools.cdi.core.IQualifier;
import org.jboss.tools.cdi.internal.core.impl.BuiltInBean;
-import org.jboss.tools.common.model.util.EclipseJavaUtil;
-import org.jboss.tools.common.model.util.EclipseResourceUtil;
/**
* @author Viacheslav Kabanovich
@@ -40,9 +27,6 @@
IInjectionPointField field = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/implementation/builtin/UserTransactionInjectedBean.java", "userTransaction");
assertNotNull(field);
- IProject p = cdiProject.getNature().getProject();
- IJavaProject jp = EclipseResourceUtil.getJavaProject(p);
-
Set<IBean> beans = field.getCDIProject().getBeans(false, field);
assertFalse(beans.isEmpty());
13 years, 6 months