JBoss Tools SVN: r22376 - in trunk/cdi: plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-05-27 11:47:31 -0400 (Thu, 27 May 2010)
New Revision: 22376
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BeanSpecializationTest.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/errorList.txt
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreTestSuite.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java
Log:
https://jira.jboss.org/browse/JBIDE-5808
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2010-05-27 15:31:26 UTC (rev 22375)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2010-05-27 15:47:31 UTC (rev 22376)
@@ -216,32 +216,55 @@
}
/**
- * Return @Named declaration or the stereotype declaration if it declares
+ * Return @Named declaration or the stereotype declaration if it declares @Named.
*
- * @Named.
+ * @param stereotyped
+ * @return
+ */
+ public static IAnnotationDeclaration getNamedDeclaration(IBean bean) {
+ return getQualifierDeclaration(bean, CDIConstants.NAMED_QUALIFIER_TYPE_NAME);
+ }
+
+ /**
+ * Return the qualifier declaration or the stereotype or @Specializes declaration if it declares this qualifier.
*
* @param stereotyped
* @return
*/
- public static IAnnotationDeclaration getNamedDeclaration(IBean bean) {
- IAnnotationDeclaration declaration = bean.getAnnotation(CDIConstants.NAMED_QUALIFIER_TYPE_NAME);
+ public static IAnnotationDeclaration getQualifierDeclaration(IBean bean, String qualifierTypeName) {
+ IAnnotationDeclaration declaration = bean.getAnnotation(qualifierTypeName);
if (declaration == null) {
- return getNamedStereotypeDeclaration(bean);
+ declaration = getQualifiedStereotypeDeclaration(bean, qualifierTypeName);
}
+ if(declaration == null) {
+ declaration = getQualifiedSpecializesDeclaration(bean, qualifierTypeName);
+ }
return declaration;
}
/**
- * Return the stereotype declaration which declares @Named.
+ * Returns the @Specializes declaration of the bean if the specialized bean declares the given qualifier.
*
+ * @param bean
+ * @param qualifierTypeName
+ * @return
+ */
+ public static IAnnotationDeclaration getQualifiedSpecializesDeclaration(IBean bean, String qualifierTypeName) {
+ IBean specializedBean = bean.getSpecializedBean();
+ return specializedBean!=null?getQualifierDeclaration(bean, qualifierTypeName):null;
+ }
+
+ /**
+ * Return the stereotype declaration which declares the given qualifier.
+ *
* @param stereotyped
* @return
*/
- public static IAnnotationDeclaration getNamedStereotypeDeclaration(IStereotyped stereotyped) {
+ public static IAnnotationDeclaration getQualifiedStereotypeDeclaration(IStereotyped stereotyped, String qualifierTypeName) {
Set<IStereotypeDeclaration> declarations = stereotyped.getStereotypeDeclarations();
for (IStereotypeDeclaration declaration : declarations) {
- if (CDIConstants.NAMED_QUALIFIER_TYPE_NAME.equals(declaration.getType().getFullyQualifiedName())
- || getNamedStereotypeDeclaration(declaration.getStereotype()) != null) {
+ if (qualifierTypeName.equals(declaration.getType().getFullyQualifiedName())
+ || getQualifiedStereotypeDeclaration(declaration.getStereotype(), qualifierTypeName) != null) {
return declaration;
}
}
@@ -249,6 +272,16 @@
}
/**
+ * Return the stereotype declaration which declares @Named.
+ *
+ * @param stereotyped
+ * @return
+ */
+ public static IAnnotationDeclaration getNamedStereotypeDeclaration(IStereotyped stereotyped) {
+ return getQualifiedStereotypeDeclaration(stereotyped, CDIConstants.NAMED_QUALIFIER_TYPE_NAME);
+ }
+
+ /**
* Returns all found annotations for parameters of the method.
*
* @param method
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/errorList.txt
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/errorList.txt 2010-05-27 15:31:26 UTC (rev 22375)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/errorList.txt 2010-05-27 15:47:31 UTC (rev 22376)
@@ -126,6 +126,12 @@
- X specializes Y and Y has a name and X declares a name explicitly, using @Named
- interceptor or decorator is annotated @Specializes (Non-Portable behavior)
+
+
+
+
+
+
5.2.2. Legal injection point types
- injection point type is a type variable
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreTestSuite.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreTestSuite.java 2010-05-27 15:31:26 UTC (rev 22375)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreTestSuite.java 2010-05-27 15:47:31 UTC (rev 22376)
@@ -23,6 +23,7 @@
import org.jboss.tools.cdi.core.test.tck.ProducerMethodDefinitionTest;
import org.jboss.tools.cdi.core.test.tck.QualifierDefinitionTest;
import org.jboss.tools.cdi.core.test.tck.ScopeDefinitionTest;
+import org.jboss.tools.cdi.core.test.tck.BeanSpecializationTest;
import org.jboss.tools.cdi.core.test.tck.StereotypeDefinitionTest;
import org.jboss.tools.cdi.core.test.tck.StereotypeInheritenceTest;
import org.jboss.tools.cdi.core.test.tck.ValidationTest;
@@ -46,6 +47,7 @@
suite.addTestSuite(StereotypeInheritenceTest.class);
suite.addTestSuite(ProducerMethodDefinitionTest.class);
suite.addTestSuite(InjectionPointTest.class);
+ suite.addTestSuite(BeanSpecializationTest.class);
suite.addTestSuite(ValidationTest.class);
return suite;
}
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BeanSpecializationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BeanSpecializationTest.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BeanSpecializationTest.java 2010-05-27 15:47:31 UTC (rev 22376)
@@ -0,0 +1,84 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.core.test.tck;
+
+import java.util.Set;
+
+import org.eclipse.jdt.core.JavaModelException;
+import org.jboss.tools.cdi.core.IBean;
+
+/**
+ * @author Alexey Kazakov
+ */
+public class BeanSpecializationTest extends TCKTest {
+
+ /**
+ * Section 4.3.1 - Direct and indirect specialization
+ * j) A bean X that specializes bean Y will include all qualifiers of Y, together with all qualifiers declared explicitly by X.
+ *
+ * @throws JavaModelException
+ */
+ public void testSimpleSpecializingBeanHasQualifiersOfSpecializedAndSpecializingBean() throws JavaModelException {
+ Set<IBean> beans = cdiProject.getBeans(true, "org.jboss.jsr299.tck.tests.inheritance.specialization.simple.LazyFarmer", "org.jboss.jsr299.tck.tests.inheritance.specialization.simple.Landowner");
+ assertEquals("Wrong number of beans.", 1, beans.size());
+ IBean bean = beans.iterator().next();
+ assertContainsBeanType(bean, "org.jboss.jsr299.tck.tests.inheritance.specialization.simple.Farmer");
+ assertContainsQualifierType(true, bean,
+ "org.jboss.jsr299.tck.tests.inheritance.specialization.simple.Landowner",
+ "org.jboss.jsr299.tck.tests.inheritance.specialization.simple.Lazy",
+ "javax.enterprise.inject.Any",
+ "javax.inject.Named");
+ }
+
+ /**
+ * Section 4.3.1 - Direct and indirect specialization
+ * j) A bean X that specializes bean Y will include all qualifiers of Y, together with all qualifiers declared explicitly by X.
+ *
+ * @throws JavaModelException
+ */
+ public void testEnterpriseSpecializingBeanHasQualifiersOfSpecializedAndSpecializingBean() throws JavaModelException {
+ Set<IBean> beans = cdiProject.getBeans(true, "org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.LazyFarmerLocal", "org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.Landowner");
+ assertEquals("Wrong number of beans.", 1, beans.size());
+ IBean bean = beans.iterator().next();
+ assertContainsBeanType(bean, "org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.FarmerLocal");
+ assertContainsQualifierType(true, bean,
+ "org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.Landowner",
+ "org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.Lazy",
+ "javax.enterprise.inject.Any",
+ "javax.inject.Named");
+ }
+
+ /**
+ * Section 4.3.1 - Direct and indirect specialization
+ * k) A bean X that specializes bean Y will have the same name as Y if Y has a name.
+ *
+ * @throws JavaModelException
+ */
+ public void testSimpleSpecializingBeanHasNameOfSpecializedBean() throws JavaModelException {
+ Set<IBean> beans = cdiProject.getBeans(true, "org.jboss.jsr299.tck.tests.inheritance.specialization.simple.LazyFarmer", "org.jboss.jsr299.tck.tests.inheritance.specialization.simple.Landowner");
+ assertEquals("Wrong number of beans.", 1, beans.size());
+ IBean bean = beans.iterator().next();
+ assertEquals("Incorrect bean name", "farmer", bean.getName());
+ }
+
+ /**
+ * Section 4.3.1 - Direct and indirect specialization
+ * k) A bean X that specializes bean Y will have the same name as Y if Y has a name.
+ *
+ * @throws JavaModelException
+ */
+ public void testEnterpriseSpecializingBeanHasNameOfSpecializedBean() throws JavaModelException {
+ Set<IBean> beans = cdiProject.getBeans(true, "org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.LazyFarmerLocal", "org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.Landowner");
+ assertEquals("Wrong number of beans.", 1, beans.size());
+ IBean bean = beans.iterator().next();
+ assertEquals("Incorrect bean name", "farmer", bean.getName());
+ }
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BeanSpecializationTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2010-05-27 15:31:26 UTC (rev 22375)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2010-05-27 15:47:31 UTC (rev 22376)
@@ -2,7 +2,6 @@
import java.io.File;
import java.io.FileFilter;
-import java.util.HashSet;
import java.util.Set;
import junit.framework.TestCase;
@@ -24,8 +23,6 @@
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.ICDIProject;
import org.jboss.tools.cdi.core.IClassBean;
-import org.jboss.tools.cdi.core.IInjectionPoint;
-import org.jboss.tools.cdi.core.IInjectionPointParameter;
import org.jboss.tools.cdi.core.IParametedType;
import org.jboss.tools.cdi.core.IQualifier;
import org.jboss.tools.cdi.core.IQualifierDeclaration;
@@ -254,17 +251,33 @@
fail(bean.getResource().getFullPath() + " bean (qualifiers - " + allTypes.toString() + ") should have the qualifier declaration with " + typeName + " type.");
}
- public static void assertContainsQualifierType(IBean bean, String typeName) {
+ public static void assertContainsQualifierType(IBean bean, String... typeNames) {
+ assertContainsQualifierType(false, bean, typeNames);
+ }
+
+ public static void assertContainsQualifierType(boolean theNumbersOfQualifierShouldBeTheSame, IBean bean, String... typeNames) {
Set<IQualifier> qualifiers = bean.getQualifiers();
+
+ if(theNumbersOfQualifierShouldBeTheSame) {
+ assertEquals("Defferent numbers of qualifiers", typeNames.length, qualifiers.size());
+ }
+
StringBuffer allTypes = new StringBuffer("[");
for (IQualifier qualifier : qualifiers) {
allTypes.append(" ").append(qualifier.getSourceType().getFullyQualifiedName()).append(";");
- if (typeName.equals(qualifier.getSourceType().getFullyQualifiedName())) {
- return;
+ }
+ allTypes.append("]");
+
+ for (String typeName : typeNames) {
+ boolean found = false;
+ for (IQualifier qualifier : qualifiers) {
+ if (typeName.equals(qualifier.getSourceType().getFullyQualifiedName())) {
+ found = true;
+ break;
+ }
}
+ assertTrue(bean.getResource().getFullPath() + " bean (qualifiers - " + allTypes.toString() + ") should have the qualifier with " + typeName + " type.", found);
}
- allTypes.append("]");
- fail(bean.getResource().getFullPath() + " bean (qualifiers - " + allTypes.toString() + ") should have the qualifier with " + typeName + " type.");
}
public static void assertLocationEquals(ITextSourceReference reference, int startPosition, int length) {
13 years, 11 months
JBoss Tools SVN: r22375 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-05-27 11:31:26 -0400 (Thu, 27 May 2010)
New Revision: 22375
Added:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarAccessFactory.java
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarAccess.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarSystemImpl.java
Log:
https://jira.jboss.org/browse/JBIDE-6372
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarAccess.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarAccess.java 2010-05-27 15:30:35 UTC (rev 22374)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarAccess.java 2010-05-27 15:31:26 UTC (rev 22375)
@@ -18,13 +18,16 @@
import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
+import org.eclipse.core.resources.IProject;
import org.jboss.tools.common.model.XModelObjectConstants;
import org.jboss.tools.common.model.plugin.ModelPlugin;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.util.FileUtil;
public class JarAccess {
@@ -274,6 +277,56 @@
return templocation;
}
+ JarSystemImpl main = null;
+ Set<JarSystemImpl> slaves = new HashSet<JarSystemImpl>();
+
+ public JarSystemImpl getMain() {
+ IProject p = EclipseResourceUtil.getProject(main);
+ if(p == null || !p.isAccessible() || main.getParent() == null) {
+ main = null;
+ synchronized(slaves) {
+ Iterator<JarSystemImpl> it = slaves.iterator();
+ while(it.hasNext()) {
+ JarSystemImpl s = it.next();
+ p = EclipseResourceUtil.getProject(s);
+ if(p == null || !p.isAccessible() || s.getParent() == null) {
+ it.remove();
+ } else if(main == null) {
+ main = s;
+ it.remove();
+ }
+ }
+ }
+ if(main != null) main.jarUpdated();
+ JarSystemImpl[] ss = getSlaves();
+ for (JarSystemImpl s: ss) s.jarUpdated();
+ }
+ return main;
+ }
+
+ public void setMain(JarSystemImpl main) {
+ this.main = main;
+ }
+
+ public JarSystemImpl[] getSlaves() {
+ synchronized(slaves) {
+ return slaves.toArray(new JarSystemImpl[slaves.size()]);
+ }
+ }
+
+ public void addSlave(JarSystemImpl s) {
+ if(main == null) {
+ main = s;
+ } else {
+ synchronized(slaves) {
+ slaves.add(s);
+ }
+ }
+ }
+
+ public boolean isSlave(JarSystemImpl s) {
+ return slaves.contains(s);
+ }
}
class LFileObjectJarImpl implements LFileObject {
Added: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarAccessFactory.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarAccessFactory.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarAccessFactory.java 2010-05-27 15:31:26 UTC (rev 22375)
@@ -0,0 +1,24 @@
+package org.jboss.tools.common.model.filesystems.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class JarAccessFactory {
+
+ static Map<String, JarAccess> jars = new HashMap<String, JarAccess>();
+
+ public static JarAccess getJarAccess(String location, JarSystemImpl context) {
+ JarAccess jar = jars.get(location);
+ if(jar == null) {
+ jar = new JarAccess();
+ jar.setMain(context);
+ jar.setLocation(location);
+ jars.put(location, jar);
+ }
+ if(context != jar.getMain()) {
+ jar.addSlave(context);
+ }
+ return jar;
+ }
+
+}
Property changes on: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarAccessFactory.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarSystemImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarSystemImpl.java 2010-05-27 15:30:35 UTC (rev 22374)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarSystemImpl.java 2010-05-27 15:31:26 UTC (rev 22375)
@@ -10,12 +10,14 @@
******************************************************************************/
package org.jboss.tools.common.model.filesystems.impl;
+import java.util.Set;
+
import org.jboss.tools.common.model.*;
import org.jboss.tools.common.model.util.*;
public class JarSystemImpl extends JarFolderImpl implements org.jboss.tools.common.model.filesystems.FileSystem {
private static final long serialVersionUID = 7958999759019059243L;
- protected JarAccess jar = new JarAccess();
+ protected JarAccess jar = null;
public JarSystemImpl() {}
@@ -28,6 +30,9 @@
}
protected JarAccess getJarAccess() {
+ if(jar == null) {
+ jar = JarAccessFactory.getJarAccess(getLocation(), this);
+ }
return jar;
}
@@ -38,15 +43,32 @@
protected String getAbsolutePath() {
return ""; //$NON-NLS-1$
}
+
+ boolean loaded2 = false;
protected void loadChildren() {
- if(jar.isLoaded()) return;
+// if(jar.isLoaded()) return;
+
+ if(this != getJarAccess().getMain()) return;
+ if(loaded2) return;
+ loaded2 = true;
+
synchronized (this) {
jar.setLocation(getLocation());
super.loadChildren();
}
}
+ public XModelObject[] getChildren() {
+ JarSystemImpl main = getJarAccess().getMain();
+ return (main == this || main == null) ? super.getChildren() : main.getChildren();
+ }
+
+ public XModelObject getChildByPathPart(String pathpart) {
+ JarSystemImpl main = getJarAccess().getMain();
+ return (main == this || main == null) ? super.getChildByPathPart(pathpart) : main.getChildByPathPart(pathpart);
+ }
+
public String getPathPart() {
return name();
}
@@ -56,29 +78,44 @@
}
public String getTempLocation() {
- if(!jar.isLoaded()) loadChildren();
+ JarSystemImpl main = getJarAccess().getMain();
+ if(main != this && main != null) {
+ main.getChildren();
+ } else if(!jar.isLoaded()) {
+ loadChildren();
+ }
String s = jar.getTempLocation();
return (s == null) ? get(XModelObjectConstants.ATTR_NAME_LOCATION) : s;
}
public LFileObject getFileObject(String relpath) {
- return jar.getFileObject(name(), relpath);
+ return getJarAccess().getFileObject(name(), relpath);
}
public boolean update() {
+ if(getJarAccess().getMain() != this) return true;
+
if(jar.isModified()) {
if(jar.isLoaded()) {
XModelObject[] cs = getChildren();
for (int i = 0; i < cs.length; i++) removeChild_0(cs[i]);
jar.invalidate();
}
- loaded = false;
- fire = true;
- fireStructureChanged(3, null);
+ jarUpdated();
+
+ JarSystemImpl[] ss = getJarAccess().getSlaves();
+ for (JarSystemImpl s: ss) s.jarUpdated();
}
return true;
}
+ public void jarUpdated() {
+ loaded = false;
+ loaded2 = false;
+ fire = true;
+ fireStructureChanged(3, null);
+ }
+
public String getPresentationString() {
String location = getLocation();
if(location != null) {
13 years, 11 months
JBoss Tools SVN: r22374 - trunk/seam/features/org.jboss.tools.seam.feature.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-05-27 11:30:35 -0400 (Thu, 27 May 2010)
New Revision: 22374
Modified:
trunk/seam/features/org.jboss.tools.seam.feature/pom.xml
Log:
fix pom/manifest versions
Modified: trunk/seam/features/org.jboss.tools.seam.feature/pom.xml
===================================================================
--- trunk/seam/features/org.jboss.tools.seam.feature/pom.xml 2010-05-27 15:29:14 UTC (rev 22373)
+++ trunk/seam/features/org.jboss.tools.seam.feature/pom.xml 2010-05-27 15:30:35 UTC (rev 22374)
@@ -9,6 +9,6 @@
</parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.seam.feature</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
13 years, 11 months
JBoss Tools SVN: r22373 - trunk/seam/plugins/org.jboss.tools.seam.ui.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-05-27 11:29:14 -0400 (Thu, 27 May 2010)
New Revision: 22373
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/pom.xml
Log:
pom and manifest version must match == 3.1.0.x
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/pom.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/pom.xml 2010-05-27 15:01:37 UTC (rev 22372)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/pom.xml 2010-05-27 15:29:14 UTC (rev 22373)
@@ -9,6 +9,6 @@
</parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.seam.ui</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
13 years, 11 months
JBoss Tools SVN: r22371 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-05-27 10:15:43 -0400 (Thu, 27 May 2010)
New Revision: 22371
Modified:
trunk/build/publish.sh
Log:
add more rsync - copy renamed *Update*.zip files too
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2010-05-27 14:06:40 UTC (rev 22370)
+++ trunk/build/publish.sh 2010-05-27 14:15:43 UTC (rev 22371)
@@ -10,6 +10,7 @@
# copy into workspace for archiving
rm -fr ${WORKSPACE}/site; mkdir -p ${WORKSPACE}/site/${JOB_NAME}
rsync -aq ${WORKSPACE}/*/site/target/site.zip ${WORKSPACE}/site/${JOB_NAME}/${ZIPNAME}
+rsync -aq ${WORKSPACE}/*/*/site/target/*Update*.zip ${WORKSPACE}/site/${JOB_NAME}/
# copy into workspace for access by bucky aggregator
rsync -aq ${WORKSPACE}/*/site/target/site.zip ${WORKSPACE}/site/${SNAPNAME}
13 years, 11 months
JBoss Tools SVN: r22370 - in branches/3.2.helios/hibernatetools/plugins: org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2010-05-27 10:06:40 -0400 (Thu, 27 May 2010)
New Revision: 22370
Modified:
branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/NamingStrategyMappingTools.java
branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaJoinColumnImpl.java
branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmJoinColumnImpl.java
branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/ColumnCombo.java
branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/DatabaseObjectCombo.java
branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/TableCombo.java
Log:
move to updated api
Modified: branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/NamingStrategyMappingTools.java
===================================================================
--- branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/NamingStrategyMappingTools.java 2010-05-27 12:43:37 UTC (rev 22369)
+++ branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/NamingStrategyMappingTools.java 2010-05-27 14:06:40 UTC (rev 22370)
@@ -111,7 +111,7 @@
}
String prefix = owner.getAttributeName();
if (prefix == null) {
- Entity targetEntity = owner.getTargetEntity();
+ Entity targetEntity = owner.getRelationshipTarget();
if (targetEntity == null) {
return null;
}
Modified: branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaJoinColumnImpl.java
===================================================================
--- branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaJoinColumnImpl.java 2010-05-27 12:43:37 UTC (rev 22369)
+++ branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaJoinColumnImpl.java 2010-05-27 14:06:40 UTC (rev 22370)
@@ -54,7 +54,7 @@
if (this.getOwner().joinColumnsSize() != 1) {
return null;
}
- Entity targetEntity = this.getOwner().getTargetEntity();
+ Entity targetEntity = this.getOwner().getRelationshipTarget();
if (targetEntity == null) {
return null;
}
Modified: branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmJoinColumnImpl.java
===================================================================
--- branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmJoinColumnImpl.java 2010-05-27 12:43:37 UTC (rev 22369)
+++ branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmJoinColumnImpl.java 2010-05-27 14:06:40 UTC (rev 22370)
@@ -117,7 +117,7 @@
if (this.getOwner().joinColumnsSize() != 1) {
return null;
}
- Entity targetEntity = this.getOwner().getTargetEntity();
+ Entity targetEntity = this.getOwner().getRelationshipTarget();
if (targetEntity == null) {
return null;
}
Modified: branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/ColumnCombo.java
===================================================================
--- branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/ColumnCombo.java 2010-05-27 12:43:37 UTC (rev 22369)
+++ branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/ColumnCombo.java 2010-05-27 14:06:40 UTC (rev 22370)
@@ -38,15 +38,6 @@
super(parentPane, subjectHolder, parent);
}
- public ColumnCombo(
- PropertyValueModel<? extends T> subjectHolder,
- Composite parent,
- WidgetFactory widgetFactory) {
-
- super(subjectHolder, parent, widgetFactory);
- }
-
-
@Override
protected Iterable<String> getValues_() {
Table dbTable = this.getDbTable();
Modified: branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/DatabaseObjectCombo.java
===================================================================
--- branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/DatabaseObjectCombo.java 2010-05-27 12:43:37 UTC (rev 22369)
+++ branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/DatabaseObjectCombo.java 2010-05-27 14:06:40 UTC (rev 22370)
@@ -74,16 +74,8 @@
super(parentPane, subjectHolder, parent);
}
+
- protected DatabaseObjectCombo(
- PropertyValueModel<? extends T> subjectHolder,
- Composite parent,
- WidgetFactory widgetFactory) {
-
- super(subjectHolder, parent, widgetFactory);
- }
-
-
// ********** initialization **********
@Override
Modified: branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/TableCombo.java
===================================================================
--- branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/TableCombo.java 2010-05-27 12:43:37 UTC (rev 22369)
+++ branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/TableCombo.java 2010-05-27 14:06:40 UTC (rev 22370)
@@ -38,15 +38,6 @@
super(parentPane, subjectHolder, parent);
}
- public TableCombo(
- PropertyValueModel<? extends T> subjectHolder,
- Composite parent,
- WidgetFactory widgetFactory) {
-
- super(subjectHolder, parent, widgetFactory);
- }
-
-
@Override
protected Iterable<String> getValues_() {
Schema dbSchema = this.getDbSchema();
13 years, 11 months
JBoss Tools SVN: r22369 - branches/3.2.helios/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/figures.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-05-27 08:43:37 -0400 (Thu, 27 May 2010)
New Revision: 22369
Modified:
branches/3.2.helios/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/figures/TilesDiagramLayout.java
Log:
https://jira.jboss.org/browse/JBIDE-6377 Fixed compile error.
Modified: branches/3.2.helios/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/figures/TilesDiagramLayout.java
===================================================================
--- branches/3.2.helios/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/figures/TilesDiagramLayout.java 2010-05-27 12:42:34 UTC (rev 22368)
+++ branches/3.2.helios/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/figures/TilesDiagramLayout.java 2010-05-27 12:43:37 UTC (rev 22369)
@@ -9,15 +9,24 @@
* Exadel, Inc. and Red Hat, Inc. - initial API and implementation
******************************************************************************/
package org.jboss.tools.jst.web.tiles.ui.editor.figures;
-import org.eclipse.draw2d.*;
-import org.eclipse.draw2d.geometry.*;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.Vector;
+import org.eclipse.draw2d.AbstractLayout;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
import org.jboss.tools.jst.web.tiles.ui.editor.edit.DefinitionEditPart;
import org.jboss.tools.jst.web.tiles.ui.editor.model.IDefinition;
import org.jboss.tools.jst.web.tiles.ui.editor.model.ITilesOptions;
-import java.util.*;
-
public class TilesDiagramLayout extends AbstractLayout{
Dimension dim = new Dimension(0,0);
Hashtable<IDefinition,Rectangle> figureDim = new Hashtable<IDefinition,Rectangle>();
13 years, 11 months
JBoss Tools SVN: r22368 - in trunk/maven/docs/maven_reference_guide/en-US: images and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2010-05-27 08:42:34 -0400 (Thu, 27 May 2010)
New Revision: 22368
Added:
trunk/maven/docs/maven_reference_guide/en-US/images/deploy_maven_project/
trunk/maven/docs/maven_reference_guide/en-US/images/deploy_maven_project/homePage.png
trunk/maven/docs/maven_reference_guide/en-US/images/deploy_maven_project/modifyResources.png
trunk/maven/docs/maven_reference_guide/en-US/images/deploy_maven_project/runOnServer.png
Modified:
trunk/maven/docs/maven_reference_guide/en-US/tasks.xml
Log:
TOOLSDOC-24 - maven guide - Deploy to server section
Added: trunk/maven/docs/maven_reference_guide/en-US/images/deploy_maven_project/homePage.png
===================================================================
(Binary files differ)
Property changes on: trunk/maven/docs/maven_reference_guide/en-US/images/deploy_maven_project/homePage.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/maven/docs/maven_reference_guide/en-US/images/deploy_maven_project/modifyResources.png
===================================================================
(Binary files differ)
Property changes on: trunk/maven/docs/maven_reference_guide/en-US/images/deploy_maven_project/modifyResources.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/maven/docs/maven_reference_guide/en-US/images/deploy_maven_project/runOnServer.png
===================================================================
(Binary files differ)
Property changes on: trunk/maven/docs/maven_reference_guide/en-US/images/deploy_maven_project/runOnServer.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/maven/docs/maven_reference_guide/en-US/tasks.xml
===================================================================
--- trunk/maven/docs/maven_reference_guide/en-US/tasks.xml 2010-05-27 12:35:18 UTC (rev 22367)
+++ trunk/maven/docs/maven_reference_guide/en-US/tasks.xml 2010-05-27 12:42:34 UTC (rev 22368)
@@ -14,6 +14,7 @@
<para>This chapter will provide you with the information on how to create mavenized projects and
import already existing maven project with <property>JBoss Maven Tool</property>.</para>
<section id="create_mavenized_project">
+
<title>Creating Maven ready Seam project</title>
<para><property>Maven Integration</property> makes the <property>Seam Wizard</property> capable of creating <property>Maven</property> ready projects to
let <property>Maven</property> get the libraries instead of using the <property>Seam</property> runtime.</para>
@@ -110,6 +111,46 @@
</mediaobject>
</figure>
</section>
+ <section id="serverdeploy">
+ <title>Deploy Maven Project to the JBoss Server</title>
+ <para>Applying <property>Maven Integration Tools</property> with <property>Seam Tools</property> make possible to handle <property>Maven</property> project in the same way as simple <property>Seam</property> project created with <property>Seam Tools</property>. Also deploying to <property>JBoss Server</property> is available. For this you need to make right click on <property>testmaven</property> project in <property>Package Explorer</property> tab then select <emphasis><property>Run As > Run on Server</property></emphasis>. </para>
+ <figure>
+ <title>Run Mavenize Seam Application on Server</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/deploy_maven_project/runOnServer.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>In opened <property>Run On Server</property> wizard choose <property>JBoss Server</property>, click <emphasis><property>Next</property></emphasis>. On the following page make sure that there is <property>testmaven-ear</property> and <property>testmaven-ear/resources/testmaven-ds.xml</property> in <property>Configured</property> column and click <emphasis><property>Finish</property></emphasis>.</para>
+ <figure>
+ <title>Run On Server</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/deploy_maven_project/modifyResources.png"/>
+ </imageobject>
+
+ </mediaobject>
+ </figure>
+
+ <para>Then <property>Maven Integration Tool</property> builds the project, prepares it to the deploy and will make deployment.</para>
+ <note>
+ <title>Note:</title>
+ <para>To deploy <property>Maven EAR Seam</property> project on <property>JBoss Server</property> you need to have a latest <property>WTP</property> build (current <property>WTP 3.1.2</property>) and need to apply a WTP patch - "<property>Patches 2010 04 13</property>" for it (it's available from <ulink url="http://download.eclipse.org/webtools/updates/">Eclipse P2 Web Tools Platform Repository</ulink>). Without this patch you are not able to deploy <property>Maven EAR</property> project to the server.</para>
+ </note>
+ <para>Deploying takes a time, after that you can open in you browser <property>http://localhost:8080/testmaven/</property> and see <property>Seam Project</property> Home page.</para>
+ <figure>
+ <title>Run Mavenize Seam Application on Server</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/deploy_maven_project/homePage.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>That's all! The <property>Maven Seam</property> project is deployed to <property>JBoss Server</property>.</para>
+
+ </section>
+
<section id="mavenized_portlet">
<title>Create new mavenized Dynamic Web Project with Portlets</title>
<para>Select in main <property>Eclipse</property> menu <emphasis><property>File > New >
13 years, 11 months
JBoss Tools SVN: r22367 - branches/3.2.helios/common/tests/org.jboss.tools.common.model.ui.test/src/org/jboss/tools/common/model/ui/reporting.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-05-27 08:35:18 -0400 (Thu, 27 May 2010)
New Revision: 22367
Modified:
branches/3.2.helios/common/tests/org.jboss.tools.common.model.ui.test/src/org/jboss/tools/common/model/ui/reporting/ReportProblemWizardTest.java
Log:
https://jira.jboss.org/browse/JBIDE-6375 Fixed ReportProblemWizardTest
Modified: branches/3.2.helios/common/tests/org.jboss.tools.common.model.ui.test/src/org/jboss/tools/common/model/ui/reporting/ReportProblemWizardTest.java
===================================================================
--- branches/3.2.helios/common/tests/org.jboss.tools.common.model.ui.test/src/org/jboss/tools/common/model/ui/reporting/ReportProblemWizardTest.java 2010-05-27 10:25:47 UTC (rev 22366)
+++ branches/3.2.helios/common/tests/org.jboss.tools.common.model.ui.test/src/org/jboss/tools/common/model/ui/reporting/ReportProblemWizardTest.java 2010-05-27 12:35:18 UTC (rev 22367)
@@ -10,29 +10,29 @@
******************************************************************************/
package org.jboss.tools.common.model.ui.reporting;
+import junit.framework.TestCase;
+
import org.eclipse.swt.widgets.Shell;
import org.jboss.tools.common.model.ui.ModelUIPlugin;
import org.jboss.tools.common.model.ui.wizards.query.IQueryDialog;
-import junit.extensions.ExceptionTestCase;
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
/**
* @author eskimo
*
*/
-public class ReportProblemWizardTest extends ExceptionTestCase {
+public class ReportProblemWizardTest extends TestCase {
- public ReportProblemWizardTest() {
- super("testReportProblemWizard", NullPointerException.class);
- }
//FIXME(modular)
public void testReportProblemWizardFixMe() {
- Shell shell = ModelUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell();
- IQueryDialog reportWiz = new ReportProblemWizard().createDialog(shell);
- reportWiz.getDialog().setBlockOnOpen(false);
- reportWiz.getDialog().open();
- reportWiz.getDialog().close();
+ try {
+ Shell shell = ModelUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell();
+ IQueryDialog reportWiz = new ReportProblemWizard().createDialog(shell);
+ reportWiz.getDialog().setBlockOnOpen(false);
+ reportWiz.getDialog().open();
+ reportWiz.getDialog().close();
+ } catch (NullPointerException e) {
+ return;
+ }
+ fail("Expected NullPointerException");
}
-}
+}
\ No newline at end of file
13 years, 11 months
JBoss Tools SVN: r22366 - trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-05-27 06:25:47 -0400 (Thu, 27 May 2010)
New Revision: 22366
Modified:
trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-notifiers.meta
Log:
https://jira.jboss.org/browse/JBIDE-6359
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-notifiers.meta
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-notifiers.meta 2010-05-27 09:31:25 UTC (rev 22365)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-notifiers.meta 2010-05-27 10:25:47 UTC (rev 22366)
@@ -774,7 +774,8 @@
<XActionItem HandlerClassName="%DefaultReplaceUnique%"
ICON="action.empty"
PROPERTIES="child=NotifyEmail;significanceMessageClass=%Replace%"
- displayName="Notify Email..." kind="action" name="CreateTargetNotifyEmail">
+ WizardClassName="%Default%" displayName="Notify Email..."
+ kind="action" name="CreateTargetNotifyEmail">
<EntityData EntityName="ESBPreTargetNotifyEmail">
<AttributeData AttributeName="from"/>
<AttributeData AttributeName="send to"/>
13 years, 11 months