JBoss Tools SVN: r13279 - workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap.
by jbosstools-commits@lists.jboss.org
Author: hardy.ferentschik
Date: 2009-01-26 13:12:25 -0500 (Mon, 26 Jan 2009)
New Revision: 13279
Modified:
workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/JPAMetaModelEntityProcessor.java
Log:
create Order_ from orm.xml
Modified: workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/JPAMetaModelEntityProcessor.java
===================================================================
--- workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/JPAMetaModelEntityProcessor.java 2009-01-26 18:10:53 UTC (rev 13278)
+++ workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/JPAMetaModelEntityProcessor.java 2009-01-26 18:12:25 UTC (rev 13279)
@@ -24,7 +24,7 @@
import org.jboss.jpa.metamodel.ap.annotation.MetaEntity;
import org.jboss.jpa.metamodel.ap.xml.XmlMetaEntity;
-@SupportedAnnotationTypes("javax.persistence.Entity")
+@SupportedAnnotationTypes("*")
@SupportedSourceVersion(RELEASE_6)
public class JPAMetaModelEntityProcessor extends AbstractProcessor {
15 years, 11 months
JBoss Tools SVN: r13278 - in workspace/max/jpaap: jpaap/src/org/jboss/jpa/metamodel/ap/annotation and 4 other directories.
by jbosstools-commits@lists.jboss.org
Author: hardy.ferentschik
Date: 2009-01-26 13:10:53 -0500 (Mon, 26 Jan 2009)
New Revision: 13278
Added:
workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/IMetaAttribute.java
workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/IMetaCollection.java
workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/annotation/
workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/annotation/MetaAttribute.java
workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/annotation/MetaCollection.java
workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/annotation/MetaEntity.java
workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/annotation/MetaMap.java
workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/annotation/MetaMember.java
workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/xml/
workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/xml/XmlMetaAttribute.java
workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/xml/XmlMetaCollection.java
workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/xml/XmlMetaEntity.java
workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/xml/XmlMetaMember.java
Removed:
workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/MetaAttribute.java
workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/MetaCollection.java
workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/MetaEntity.java
workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/MetaMap.java
workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/MetaMember.java
Modified:
workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/IMetaMember.java
workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/JPAMetaModelEntityProcessor.java
workspace/max/jpaap/test/src/META-INF/orm.xml
workspace/max/jpaap/test/src/Test.java
workspace/max/jpaap/test/src/model/Order.java
workspace/max/jpaap/test/src/model/Product.java
Log:
create Order_ from orm.xml
Added: workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/IMetaAttribute.java
===================================================================
--- workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/IMetaAttribute.java (rev 0)
+++ workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/IMetaAttribute.java 2009-01-26 18:10:53 UTC (rev 13278)
@@ -0,0 +1,24 @@
+// $Id:$
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, Red Hat Middleware LLC, 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.jpa.metamodel.ap;
+
+/**
+ * @author Hardy Ferentschik
+ */
+public interface IMetaAttribute extends IMetaMember {
+}
Added: workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/IMetaCollection.java
===================================================================
--- workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/IMetaCollection.java (rev 0)
+++ workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/IMetaCollection.java 2009-01-26 18:10:53 UTC (rev 13278)
@@ -0,0 +1,26 @@
+// $Id:$
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, Red Hat Middleware LLC, 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.jpa.metamodel.ap;
+
+import org.jboss.jpa.metamodel.ap.IMetaMember;
+
+/**
+ * @author Hardy Ferentschik
+ */
+public interface IMetaCollection extends IMetaMember {
+}
Modified: workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/IMetaMember.java
===================================================================
--- workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/IMetaMember.java 2009-01-26 18:00:58 UTC (rev 13277)
+++ workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/IMetaMember.java 2009-01-26 18:10:53 UTC (rev 13278)
@@ -22,4 +22,10 @@
*/
public interface IMetaMember {
String getDeclarationString();
+
+ String getMetaType();
+
+ String getPropertyName();
+
+ String getTypeDeclaration();
}
Modified: workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/JPAMetaModelEntityProcessor.java
===================================================================
--- workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/JPAMetaModelEntityProcessor.java 2009-01-26 18:00:58 UTC (rev 13277)
+++ workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/JPAMetaModelEntityProcessor.java 2009-01-26 18:10:53 UTC (rev 13278)
@@ -13,14 +13,17 @@
import javax.lang.model.element.AnnotationMirror;
import javax.lang.model.element.Element;
import javax.lang.model.element.ElementKind;
-import javax.lang.model.element.Name;
import javax.lang.model.element.TypeElement;
+import javax.lang.model.util.Elements;
import javax.tools.Diagnostic;
import javax.tools.FileObject;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
+import org.jboss.jpa.metamodel.ap.annotation.MetaEntity;
+import org.jboss.jpa.metamodel.ap.xml.XmlMetaEntity;
+
@SupportedAnnotationTypes("javax.persistence.Entity")
@SupportedSourceVersion(RELEASE_6)
public class JPAMetaModelEntityProcessor extends AbstractProcessor {
@@ -29,6 +32,8 @@
private static final Map<String, IMetaEntity> metaEntities = new HashMap<String, IMetaEntity>();
+ private boolean ormProcessed = false;
+
public JPAMetaModelEntityProcessor() {
}
@@ -41,10 +46,10 @@
* Tries to check whether a orm.xml file exists and parses it using JAXB
*/
private void parsingOrmXml() {
- System.out.println("Checking for orm.xml");
+ processingEnv.getMessager().printMessage(Diagnostic.Kind.NOTE, "Checking for orm.xml");
InputStream ormStream = this.getClass().getResourceAsStream(ORM_XML_LOCATION);
if (ormStream == null) {
- System.out.println("No orm.xml found.");
+ processingEnv.getMessager().printMessage(Diagnostic.Kind.NOTE, "No orm.xml found.");
return;
}
try {
@@ -54,22 +59,16 @@
Collection<Entity> entities = mappings.getEntity();
String packageName = mappings.getPackage();
for (Entity entity : entities) {
- String fullyQualifiedClassName = packageName + "." + entity.getClazz();
- Element typeElement = processingEnv.getElementUtils().getTypeElement(fullyQualifiedClassName);
- MetaEntity metaEntity = new MetaEntity(processingEnv, (TypeElement) typeElement);
+ String fullyQualifiedClassName = packageName + "." + entity.getClazz();
+ Elements utils = processingEnv.getElementUtils();
+ XmlMetaEntity metaEntity = new XmlMetaEntity(entity, packageName, utils.getTypeElement(fullyQualifiedClassName));
+ writeFile(metaEntity);
- // TODO
- // here we would like to somehow take the XML info and merge it into the MetaEntity
- // or maybe create interfaces for the MetaXXX classes. One set of implementation could be backed by
- // TypeEelement and one by the xml Entity
-
-
-
// keep track of alreay processed entities
metaEntities.put(fullyQualifiedClassName, metaEntity);
}
} catch (JAXBException e) {
- System.err.println("Error unmarshalling orm.xml");
+ processingEnv.getMessager().printMessage(Diagnostic.Kind.NOTE, "Error unmarshalling orm.xml");
e.printStackTrace();
}
}
@@ -86,7 +85,7 @@
final RoundEnvironment aRoundEnvironment) {
- if (aRoundEnvironment.processingOver()) { // No need to run since all our output needs to be considered
+ if (aRoundEnvironment.processingOver()) {
return false;
}
@@ -109,11 +108,8 @@
if (element.getKind() == ElementKind.CLASS &&
annotationType.equals(javax.persistence.Entity.class.getName())) {
-
MetaEntity metaEntity = new MetaEntity(processingEnv, (TypeElement) element);
-
writeFile(metaEntity);
-
}
}
}
Deleted: workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/MetaAttribute.java
===================================================================
--- workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/MetaAttribute.java 2009-01-26 18:00:58 UTC (rev 13277)
+++ workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/MetaAttribute.java 2009-01-26 18:10:53 UTC (rev 13278)
@@ -1,16 +0,0 @@
-package org.jboss.jpa.metamodel.ap;
-
-import javax.lang.model.element.Element;
-
-public class MetaAttribute extends MetaMember {
-
- public MetaAttribute(MetaEntity parent, Element element, String type) {
- super(parent, element, type);
- }
-
- @Override
- protected String getMetaType() {
- return "javax.jpa.metamodel.Attribute";
- }
-
-}
Deleted: workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/MetaCollection.java
===================================================================
--- workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/MetaCollection.java 2009-01-26 18:00:58 UTC (rev 13277)
+++ workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/MetaCollection.java 2009-01-26 18:10:53 UTC (rev 13278)
@@ -1,22 +0,0 @@
-package org.jboss.jpa.metamodel.ap;
-
-import javax.lang.model.element.Element;
-
-
-public class MetaCollection extends MetaMember {
-
- private String collectionType;
-
-
- public MetaCollection(MetaEntity parent, Element element, String collectionType, String elementType) {
- super(parent, element, elementType);
- this.collectionType = collectionType;
- }
-
- @Override
- protected String getMetaType() {
- return collectionType;
- }
-
-
-}
Deleted: workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/MetaEntity.java
===================================================================
--- workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/MetaEntity.java 2009-01-26 18:00:58 UTC (rev 13277)
+++ workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/MetaEntity.java 2009-01-26 18:10:53 UTC (rev 13278)
@@ -1,217 +0,0 @@
-package org.jboss.jpa.metamodel.ap;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.processing.ProcessingEnvironment;
-import javax.lang.model.element.AnnotationMirror;
-import javax.lang.model.element.Element;
-import javax.lang.model.element.ElementKind;
-import javax.lang.model.element.Name;
-import javax.lang.model.element.PackageElement;
-import javax.lang.model.element.TypeElement;
-import javax.lang.model.type.DeclaredType;
-import javax.lang.model.type.ExecutableType;
-import javax.lang.model.type.PrimitiveType;
-import javax.lang.model.type.TypeMirror;
-import javax.lang.model.util.ElementFilter;
-import javax.lang.model.util.SimpleTypeVisitor6;
-import javax.tools.Diagnostic.Kind;
-
-public class MetaEntity implements IMetaEntity {
-
- final TypeElement element;
- final protected ProcessingEnvironment pe;
-
- final ImportContext importContext;
-
- public MetaEntity(ProcessingEnvironment pe, TypeElement element) {
- this.element = element;
- this.pe = pe;
- importContext = new ImportContextImpl(getPackageName().toString());
- }
-
- public String getSimpleName() {
- return element.getSimpleName().toString();
- }
-
- public Element getOriginalElement() {
- return element;
- }
-
- public String getQualifiedName() {
- return element.getQualifiedName().toString();
- }
-
- public String getPackageName() {
- PackageElement packageOf = pe.getElementUtils().getPackageOf(element);
- return pe.getElementUtils().getName(packageOf.getQualifiedName() + ".metamodel").toString();
- }
-
- public List<IMetaMember> getMembers() {
-
- List<IMetaMember> members = new ArrayList<IMetaMember>();
-
- if (useFields()) {
-
- List<? extends Element> myMembers = ElementFilter.fieldsIn(element.getEnclosedElements());
-
- System.out.println("Scanning " + myMembers.size() + " field s for " + element.toString());
-
- for (Element mymember : myMembers) {
-
- MetaMember result = mymember.asType().accept(new TypeVisitor(this), mymember);
- if (result != null) {
- members.add(result);
- } else {
- pe.getMessager().printMessage(Kind.WARNING, "Could not find valid info for JPA property", mymember);
- }
- }
-
- } else {
-
-
- List<? extends Element> myMembers = ElementFilter.methodsIn(element.getEnclosedElements());
-
- System.out.println("Scanning " + myMembers.size() + " methods for " + element.toString());
- for (Element mymember : myMembers) {
-
- MetaMember result = mymember.asType().accept(new TypeVisitor(this), mymember);
- if (result != null) {
- members.add(result);
- } else {
- //pe.getMessager().printMessage(Kind.WARNING, "Not a valid JPA property", mymember);
- }
- }
-
- }
-
- if (members.size() == 0) {
- pe.getMessager().printMessage(Kind.WARNING, "No properties found on " + element, element);
- }
- return members;
- }
-
-
- //TODO: Find more efficient way to identify wether we should use fields or properties
- private boolean useFields() {
- List<? extends Element> myMembers = element.getEnclosedElements();
- for (Element element : myMembers) {
- List<? extends AnnotationMirror> entityAnnotations =
- pe.getElementUtils().getAllAnnotationMirrors(element);
-
- for (Iterator<?> iterator = entityAnnotations.iterator(); iterator
- .hasNext();) {
- AnnotationMirror annotationMirror = (AnnotationMirror) iterator
- .next();
-
- final String annotationType = annotationMirror.getAnnotationType().toString();
-
- if (annotationType.equals(javax.persistence.Id.class.getName()) ||
- annotationType.equals(javax.persistence.EmbeddedId.class.getName())) {
- if (element.getKind() == ElementKind.FIELD) {
- return true;
- }
- }
- }
- }
-
- return false;
- }
-
-
- static Map<String, String> COLLECTIONS = new HashMap<String, String>();
-
- static {
- COLLECTIONS.put("java.util.Collection", "javax.jpa.metamodel.Collection");
- COLLECTIONS.put("java.util.Set", "javax.jpa.metamodel.Set");
- COLLECTIONS.put("java.util.List", "javax.jpa.metamodel.List");
- COLLECTIONS.put("java.util.Map", "javax.jpa.metamodel.Map");
- }
-
- class TypeVisitor extends SimpleTypeVisitor6<MetaMember, Element> {
-
- MetaEntity parent;
-
- TypeVisitor(MetaEntity parent) {
- this.parent = parent;
- }
-
- @Override
- protected MetaMember defaultAction(TypeMirror e, Element p) {
- //System.out.println("Default action for: " + e + " on " + p);
- //new Exception().printStackTrace();
- return super.defaultAction(e, p);
- }
-
- @Override
- public MetaMember visitPrimitive(PrimitiveType t, Element p) {
- return new MetaAttribute(parent, p, TypeUtils.toTypeString(t));
- }
-
-
- @Override
- public MetaMember visitDeclared(DeclaredType t, Element p) {
- TypeElement e = (TypeElement) pe.getTypeUtils().asElement(t);
-
- String collection = COLLECTIONS.get(e.getQualifiedName().toString()); // WARNING: .toString() is necessary here since Name equals does not compare to String
- if (collection != null) {
- if (collection.equals("javax.jpa.metamodel.Map")) {
- return new MetaMap(parent, p, collection, getKeyType(t), getElementType(t));
- } else {
- return new MetaCollection(parent, p, collection, getElementType(t));
- }
- } else {
- return new MetaAttribute(parent, p, e.getQualifiedName().toString());
- }
- }
-
-
- @Override
- public MetaMember visitExecutable(ExecutableType t, Element p) {
- String string = p.getSimpleName().toString();
-
- // TODO: implement proper property get/is/boolean detection
- if (string.startsWith("get") || string.startsWith("is")) {
- TypeMirror returnType = t.getReturnType();
-
- return returnType.accept(this, p);
- } else {
- return null;
- }
- }
- }
-
- public String generateImports() {
- return importContext.generateImports();
- }
-
- public String importType(String fqcn) {
- return importContext.importType(fqcn);
- }
-
- public String staticImport(String fqcn, String member) {
- return importContext.staticImport(fqcn, member);
- }
-
- public String importType(Name qualifiedName) {
- return importType(qualifiedName.toString());
- }
-
- private String getKeyType(DeclaredType t) {
- System.out.println("key type" + t);
- return t.getTypeArguments().get(0).toString();
- }
-
-
- private String getElementType(DeclaredType declaredType) {
- if (declaredType.getTypeArguments().size() == 1) {
- return declaredType.getTypeArguments().get(0).toString();
- } else {
- return declaredType.getTypeArguments().get(1).toString();
- }
- }
-}
Deleted: workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/MetaMap.java
===================================================================
--- workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/MetaMap.java 2009-01-26 18:00:58 UTC (rev 13277)
+++ workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/MetaMap.java 2009-01-26 18:10:53 UTC (rev 13278)
@@ -1,19 +0,0 @@
-package org.jboss.jpa.metamodel.ap;
-
-import javax.lang.model.element.Element;
-
-public class MetaMap extends MetaCollection {
-
- private final String keyType;
-
- public MetaMap(MetaEntity parent, Element element, String collectionType,
- String keyType, String elementType) {
- super(parent, element, collectionType, elementType);
- this.keyType = keyType;
- }
-
- public String getDeclarationString() {
- return "public static " + parent.importType(getMetaType()) + "<" + parent.importType(parent.getQualifiedName()) + ", " + parent.importType(keyType) + ", " + parent.importType(getTypeDeclaration()) + "> " + getPropertyName() + ";";
- }
-
-}
Deleted: workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/MetaMember.java
===================================================================
--- workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/MetaMember.java 2009-01-26 18:00:58 UTC (rev 13277)
+++ workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/MetaMember.java 2009-01-26 18:10:53 UTC (rev 13278)
@@ -1,52 +0,0 @@
-package org.jboss.jpa.metamodel.ap;
-
-import java.beans.Introspector;
-
-import javax.annotation.processing.ProcessingEnvironment;
-import javax.lang.model.element.Element;
-import javax.lang.model.element.ElementKind;
-import javax.lang.model.element.Name;
-
-public abstract class MetaMember implements IMetaMember {
-
- final protected Element element;
- final protected MetaEntity parent;
- final protected ProcessingEnvironment pe;
- private final String type;
-
- public MetaMember(MetaEntity parent, Element element, String type) {
- this.element = element;
- this.parent = parent;
- this.type = type;
- this.pe = parent.pe;
- }
-
- public String getDeclarationString() {
- return "public static " + parent.importType(getMetaType()) + "<" + parent.importType(parent.getQualifiedName()) + ", " + parent.importType(getTypeDeclaration()) + "> " + getPropertyName() + ";";
- }
-
- protected Name getPropertyName() {
- if(element.getKind()==ElementKind.FIELD) {
- return element.getSimpleName();
- } else if (element.getKind()==ElementKind.METHOD) {
-
- String name = element.getSimpleName().toString();
- if(name.startsWith("get")) {
- return pe.getElementUtils().getName(Introspector.decapitalize(name.substring("get".length())));
- } else if(name.startsWith("is")) {
- return (pe.getElementUtils().getName(Introspector.decapitalize(name.substring("is".length()))));
- }
- return pe.getElementUtils().getName(Introspector.decapitalize(name));
- } else {
- return pe.getElementUtils().getName(element.getSimpleName() + "/* " + element.getKind() + " */");
- }
- }
-
- abstract protected String getMetaType();
-
-
- protected String getTypeDeclaration() {
- return type;
- }
-
-}
Copied: workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/annotation/MetaAttribute.java (from rev 13111, workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/MetaAttribute.java)
===================================================================
--- workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/annotation/MetaAttribute.java (rev 0)
+++ workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/annotation/MetaAttribute.java 2009-01-26 18:10:53 UTC (rev 13278)
@@ -0,0 +1,18 @@
+package org.jboss.jpa.metamodel.ap.annotation;
+
+import org.jboss.jpa.metamodel.ap.IMetaAttribute;
+
+import javax.lang.model.element.Element;
+
+public class MetaAttribute extends MetaMember implements IMetaAttribute {
+
+ public MetaAttribute(MetaEntity parent, Element element, String type) {
+ super(parent, element, type);
+ }
+
+ @Override
+ public String getMetaType() {
+ return "javax.jpa.metamodel.Attribute";
+ }
+
+}
Copied: workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/annotation/MetaCollection.java (from rev 13111, workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/MetaCollection.java)
===================================================================
--- workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/annotation/MetaCollection.java (rev 0)
+++ workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/annotation/MetaCollection.java 2009-01-26 18:10:53 UTC (rev 13278)
@@ -0,0 +1,24 @@
+package org.jboss.jpa.metamodel.ap.annotation;
+
+import org.jboss.jpa.metamodel.ap.IMetaCollection;
+
+import javax.lang.model.element.Element;
+
+
+public class MetaCollection extends MetaMember implements IMetaCollection {
+
+ private String collectionType;
+
+
+ public MetaCollection(MetaEntity parent, Element element, String collectionType, String elementType) {
+ super(parent, element, elementType);
+ this.collectionType = collectionType;
+ }
+
+ @Override
+ public String getMetaType() {
+ return collectionType;
+ }
+
+
+}
Copied: workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/annotation/MetaEntity.java (from rev 13152, workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/MetaEntity.java)
===================================================================
--- workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/annotation/MetaEntity.java (rev 0)
+++ workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/annotation/MetaEntity.java 2009-01-26 18:10:53 UTC (rev 13278)
@@ -0,0 +1,217 @@
+package org.jboss.jpa.metamodel.ap.annotation;
+
+import org.jboss.jpa.metamodel.ap.*;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.processing.ProcessingEnvironment;
+import javax.lang.model.element.AnnotationMirror;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ElementKind;
+import javax.lang.model.element.Name;
+import javax.lang.model.element.PackageElement;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.DeclaredType;
+import javax.lang.model.type.ExecutableType;
+import javax.lang.model.type.PrimitiveType;
+import javax.lang.model.type.TypeMirror;
+import javax.lang.model.util.ElementFilter;
+import javax.lang.model.util.SimpleTypeVisitor6;
+import javax.tools.Diagnostic.Kind;
+
+public class MetaEntity implements IMetaEntity {
+
+ final TypeElement element;
+ final protected ProcessingEnvironment pe;
+
+ final ImportContext importContext;
+
+ public MetaEntity(ProcessingEnvironment pe, TypeElement element) {
+ this.element = element;
+ this.pe = pe;
+ importContext = new ImportContextImpl(getPackageName().toString());
+ }
+
+ public String getSimpleName() {
+ return element.getSimpleName().toString();
+ }
+
+ public Element getOriginalElement() {
+ return element;
+ }
+
+ public String getQualifiedName() {
+ return element.getQualifiedName().toString();
+ }
+
+ public String getPackageName() {
+ PackageElement packageOf = pe.getElementUtils().getPackageOf(element);
+ return pe.getElementUtils().getName(packageOf.getQualifiedName() + ".metamodel").toString();
+ }
+
+ public List<IMetaMember> getMembers() {
+
+ List<IMetaMember> members = new ArrayList<IMetaMember>();
+
+ if (useFields()) {
+
+ List<? extends Element> myMembers = ElementFilter.fieldsIn(element.getEnclosedElements());
+
+ System.out.println("Scanning " + myMembers.size() + " field s for " + element.toString());
+
+ for (Element mymember : myMembers) {
+
+ MetaMember result = mymember.asType().accept(new TypeVisitor(this), mymember);
+ if (result != null) {
+ members.add(result);
+ } else {
+ pe.getMessager().printMessage(Kind.WARNING, "Could not find valid info for JPA property", mymember);
+ }
+ }
+
+ } else {
+
+
+ List<? extends Element> myMembers = ElementFilter.methodsIn(element.getEnclosedElements());
+
+ System.out.println("Scanning " + myMembers.size() + " methods for " + element.toString());
+ for (Element mymember : myMembers) {
+
+ MetaMember result = mymember.asType().accept(new TypeVisitor(this), mymember);
+ if (result != null) {
+ members.add(result);
+ } else {
+ //pe.getMessager().printMessage(Kind.WARNING, "Not a valid JPA property", mymember);
+ }
+ }
+
+ }
+
+ if (members.size() == 0) {
+ pe.getMessager().printMessage(Kind.WARNING, "No properties found on " + element, element);
+ }
+ return members;
+ }
+
+
+ //TODO: Find more efficient way to identify wether we should use fields or properties
+ private boolean useFields() {
+ List<? extends Element> myMembers = element.getEnclosedElements();
+ for (Element element : myMembers) {
+ List<? extends AnnotationMirror> entityAnnotations =
+ pe.getElementUtils().getAllAnnotationMirrors(element);
+
+ for (Iterator<?> iterator = entityAnnotations.iterator(); iterator
+ .hasNext();) {
+ AnnotationMirror annotationMirror = (AnnotationMirror) iterator
+ .next();
+
+ final String annotationType = annotationMirror.getAnnotationType().toString();
+
+ if (annotationType.equals(javax.persistence.Id.class.getName()) ||
+ annotationType.equals(javax.persistence.EmbeddedId.class.getName())) {
+ if (element.getKind() == ElementKind.FIELD) {
+ return true;
+ }
+ }
+ }
+ }
+
+ return false;
+ }
+
+
+ static Map<String, String> COLLECTIONS = new HashMap<String, String>();
+
+ static {
+ COLLECTIONS.put("java.util.Collection", "javax.jpa.metamodel.Collection");
+ COLLECTIONS.put("java.util.Set", "javax.jpa.metamodel.Set");
+ COLLECTIONS.put("java.util.List", "javax.jpa.metamodel.List");
+ COLLECTIONS.put("java.util.Map", "javax.jpa.metamodel.Map");
+ }
+
+ class TypeVisitor extends SimpleTypeVisitor6<MetaMember, Element> {
+
+ MetaEntity parent;
+
+ TypeVisitor(MetaEntity parent) {
+ this.parent = parent;
+ }
+
+ @Override
+ protected MetaMember defaultAction(TypeMirror e, Element p) {
+ return super.defaultAction(e, p);
+ }
+
+ @Override
+ public MetaMember visitPrimitive(PrimitiveType t, Element p) {
+ return new MetaAttribute(parent, p, TypeUtils.toTypeString(t));
+ }
+
+
+ @Override
+ public MetaMember visitDeclared(DeclaredType t, Element p) {
+ TypeElement e = (TypeElement) pe.getTypeUtils().asElement(t);
+
+ String collection = COLLECTIONS.get(e.getQualifiedName().toString()); // WARNING: .toString() is necessary here since Name equals does not compare to String
+ if (collection != null) {
+ if (collection.equals("javax.jpa.metamodel.Map")) {
+ return new MetaMap(parent, p, collection, getKeyType(t), getElementType(t));
+ } else {
+ return new MetaCollection(parent, p, collection, getElementType(t));
+ }
+ } else {
+ return new MetaAttribute(parent, p, e.getQualifiedName().toString());
+ }
+ }
+
+
+ @Override
+ public MetaMember visitExecutable(ExecutableType t, Element p) {
+ String string = p.getSimpleName().toString();
+
+ // TODO: implement proper property get/is/boolean detection
+ if (string.startsWith("get") || string.startsWith("is")) {
+ TypeMirror returnType = t.getReturnType();
+
+ return returnType.accept(this, p);
+ } else {
+ return null;
+ }
+ }
+ }
+
+ public String generateImports() {
+ return importContext.generateImports();
+ }
+
+ public String importType(String fqcn) {
+ return importContext.importType(fqcn);
+ }
+
+ public String staticImport(String fqcn, String member) {
+ return importContext.staticImport(fqcn, member);
+ }
+
+ public String importType(Name qualifiedName) {
+ return importType(qualifiedName.toString());
+ }
+
+ private String getKeyType(DeclaredType t) {
+ System.out.println("key type" + t);
+ return t.getTypeArguments().get(0).toString();
+ }
+
+
+ private String getElementType(DeclaredType declaredType) {
+ if (declaredType.getTypeArguments().size() == 1) {
+ return declaredType.getTypeArguments().get(0).toString();
+ } else {
+ return declaredType.getTypeArguments().get(1).toString();
+ }
+ }
+}
Copied: workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/annotation/MetaMap.java (from rev 13111, workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/MetaMap.java)
===================================================================
--- workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/annotation/MetaMap.java (rev 0)
+++ workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/annotation/MetaMap.java 2009-01-26 18:10:53 UTC (rev 13278)
@@ -0,0 +1,19 @@
+package org.jboss.jpa.metamodel.ap.annotation;
+
+import javax.lang.model.element.Element;
+
+public class MetaMap extends MetaCollection {
+
+ private final String keyType;
+
+ public MetaMap(MetaEntity parent, Element element, String collectionType,
+ String keyType, String elementType) {
+ super(parent, element, collectionType, elementType);
+ this.keyType = keyType;
+ }
+
+ public String getDeclarationString() {
+ return "public static " + parent.importType(getMetaType()) + "<" + parent.importType(parent.getQualifiedName()) + ", " + parent.importType(keyType) + ", " + parent.importType(getTypeDeclaration()) + "> " + getPropertyName() + ";";
+ }
+
+}
Copied: workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/annotation/MetaMember.java (from rev 13152, workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/MetaMember.java)
===================================================================
--- workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/annotation/MetaMember.java (rev 0)
+++ workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/annotation/MetaMember.java 2009-01-26 18:10:53 UTC (rev 13278)
@@ -0,0 +1,52 @@
+package org.jboss.jpa.metamodel.ap.annotation;
+
+import org.jboss.jpa.metamodel.ap.IMetaMember;
+
+import java.beans.Introspector;
+
+import javax.annotation.processing.ProcessingEnvironment;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ElementKind;
+import javax.lang.model.element.Name;
+
+public abstract class MetaMember implements IMetaMember {
+
+ final protected Element element;
+ final protected MetaEntity parent;
+ final protected ProcessingEnvironment pe;
+ private final String type;
+
+ public MetaMember(MetaEntity parent, Element element, String type) {
+ this.element = element;
+ this.parent = parent;
+ this.type = type;
+ this.pe = parent.pe;
+ }
+
+ public String getDeclarationString() {
+ return "public static " + parent.importType(getMetaType()) + "<" + parent.importType(parent.getQualifiedName()) + ", " + parent.importType(getTypeDeclaration()) + "> " + getPropertyName() + ";";
+ }
+
+ public String getPropertyName() {
+ if(element.getKind()==ElementKind.FIELD) {
+ return element.getSimpleName().toString();
+ } else if (element.getKind()==ElementKind.METHOD) {
+
+ String name = element.getSimpleName().toString();
+ if(name.startsWith("get")) {
+ return pe.getElementUtils().getName(Introspector.decapitalize(name.substring("get".length()))).toString();
+ } else if(name.startsWith("is")) {
+ return (pe.getElementUtils().getName(Introspector.decapitalize(name.substring("is".length())))).toString();
+ }
+ return pe.getElementUtils().getName(Introspector.decapitalize(name)).toString();
+ } else {
+ return pe.getElementUtils().getName(element.getSimpleName() + "/* " + element.getKind() + " */").toString();
+ }
+ }
+
+ abstract public String getMetaType();
+
+ public String getTypeDeclaration() {
+ return type;
+ }
+}
Added: workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/xml/XmlMetaAttribute.java
===================================================================
--- workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/xml/XmlMetaAttribute.java (rev 0)
+++ workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/xml/XmlMetaAttribute.java 2009-01-26 18:10:53 UTC (rev 13278)
@@ -0,0 +1,35 @@
+// $Id:$
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, Red Hat Middleware LLC, 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.jpa.metamodel.ap.xml;
+
+import org.jboss.jpa.metamodel.ap.IMetaAttribute;
+
+/**
+ * @author Hardy Ferentschik
+ */
+public class XmlMetaAttribute extends XmlMetaMember implements IMetaAttribute {
+
+ public XmlMetaAttribute(XmlMetaEntity parent, String propertyName, String type) {
+ super(parent, propertyName, type);
+ }
+
+ @Override
+ public String getMetaType() {
+ return "javax.jpa.metamodel.Attribute";
+ }
+}
Added: workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/xml/XmlMetaCollection.java
===================================================================
--- workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/xml/XmlMetaCollection.java (rev 0)
+++ workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/xml/XmlMetaCollection.java 2009-01-26 18:10:53 UTC (rev 13278)
@@ -0,0 +1,38 @@
+// $Id:$
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, Red Hat Middleware LLC, 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.jpa.metamodel.ap.xml;
+
+import org.jboss.jpa.metamodel.ap.IMetaCollection;
+
+/**
+ * @author Hardy Ferentschik
+ */
+public class XmlMetaCollection extends XmlMetaMember implements IMetaCollection {
+
+ String collectionType;
+
+ public XmlMetaCollection(XmlMetaEntity parent, String propertyName, String type, String collectionType) {
+ super(parent, propertyName, type);
+ this.collectionType = collectionType;
+ }
+
+ @Override
+ public String getMetaType() {
+ return collectionType;
+ }
+}
\ No newline at end of file
Added: workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/xml/XmlMetaEntity.java
===================================================================
--- workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/xml/XmlMetaEntity.java (rev 0)
+++ workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/xml/XmlMetaEntity.java 2009-01-26 18:10:53 UTC (rev 13278)
@@ -0,0 +1,173 @@
+// $Id:$
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, Red Hat Middleware LLC, 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.jpa.metamodel.ap.xml;
+
+import com.sun.java.xml.ns.persistence.orm.*;
+import org.jboss.jpa.metamodel.ap.IMetaEntity;
+import org.jboss.jpa.metamodel.ap.IMetaMember;
+import org.jboss.jpa.metamodel.ap.ImportContext;
+import org.jboss.jpa.metamodel.ap.ImportContextImpl;
+
+import javax.lang.model.element.Element;
+import javax.lang.model.element.Name;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.DeclaredType;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Hardy Ferentschik
+ */
+public class XmlMetaEntity implements IMetaEntity {
+
+ static Map<String, String> COLLECTIONS = new HashMap<String, String>();
+
+ static {
+ COLLECTIONS.put("java.util.Collection", "javax.jpa.metamodel.Collection");
+ COLLECTIONS.put("java.util.Set", "javax.jpa.metamodel.Set");
+ COLLECTIONS.put("java.util.List", "javax.jpa.metamodel.List");
+ COLLECTIONS.put("java.util.Map", "javax.jpa.metamodel.Map");
+ }
+
+ final private Entity ormEntity;
+
+ final private String packageName;
+
+ final private ImportContext importContext;
+
+ final private List<IMetaMember> members = new ArrayList<IMetaMember>();
+
+ private TypeElement type;
+
+ public XmlMetaEntity(Entity ormEntity, String packageName, TypeElement type) {
+ this.ormEntity = ormEntity;
+ this.packageName = packageName;
+ importContext = new ImportContextImpl(getPackageName());
+ this.type = type;
+ Attributes attributes = ormEntity.getAttributes();
+ Id id = attributes.getId().get(0);
+ XmlMetaAttribute attribute = new XmlMetaAttribute(this, id.getName(), getType(id.getName()));
+ members.add(attribute);
+
+ for (Basic basic : attributes.getBasic()) {
+ attribute = new XmlMetaAttribute(this, basic.getName(), getType(basic.getName()));
+ members.add(attribute);
+ }
+
+ for (ManyToOne manyToOne : attributes.getManyToOne()) {
+ attribute = new XmlMetaAttribute(this, manyToOne.getName(), getType(manyToOne.getName()));
+ members.add(attribute);
+ }
+
+ XmlMetaCollection metaCollection;
+ for (OneToMany oneToMany : attributes.getOneToMany()) {
+ String[] types = getCollectionType(oneToMany.getName());
+ metaCollection = new XmlMetaCollection(this, oneToMany.getName(), types[0], types[1]);
+ members.add(metaCollection);
+ }
+
+ for (ElementCollection collection : attributes.getElementCollection()) {
+ String[] types = getCollectionType(collection.getName());
+ metaCollection = new XmlMetaCollection(this, collection.getName(), types[0], types[1]);
+ members.add(metaCollection);
+ }
+ }
+
+ @Override
+ public String getSimpleName() {
+ return ormEntity.getClazz();
+ }
+
+ @Override
+ public String getQualifiedName() {
+ return packageName + "." + getSimpleName();
+ }
+
+ @Override
+ public String getPackageName() {
+ return packageName + ".metamodel";
+ }
+
+ @Override
+ public List<IMetaMember> getMembers() {
+ return members;
+ }
+
+ public String generateImports() {
+ return importContext.generateImports();
+ }
+
+ public String importType(String fqcn) {
+ return importContext.importType(fqcn);
+ }
+
+ public String staticImport(String fqcn, String member) {
+ return importContext.staticImport(fqcn, member);
+ }
+
+ public String importType(Name qualifiedName) {
+ return importType(qualifiedName.toString());
+ }
+
+ private String[] getCollectionType(String propertyName) {
+ String types[] = new String[2];
+ for (Element elem : type.getEnclosedElements()) {
+ if (elem.getSimpleName().toString().equals(propertyName)) {
+ DeclaredType type = ((DeclaredType) elem.asType());
+ types[0] = type.getTypeArguments().get(0).toString();
+ types[1] = COLLECTIONS.get(type.asElement().toString());
+ }
+ }
+ return types;
+ }
+
+ // TODO - so far only prototype. Only tested for the Order orm.xml
+ private String getType(String propertyName) {
+ String typeName = null;
+ for (Element elem : type.getEnclosedElements()) {
+ if (elem.getSimpleName().toString().equals(propertyName)) {
+ switch (elem.asType().getKind()) {
+ case INT: {
+ typeName = "java.lang.Integer";
+ break;
+ }
+ case LONG: {
+ typeName = "java.lang.Long";
+ break;
+ }
+ case BOOLEAN: {
+ typeName = "java.lang.Boolean";
+ break;
+ }
+ case DECLARED: {
+ typeName = ((DeclaredType) elem.asType()).toString();
+ break;
+ }
+ case TYPEVAR: {
+ typeName = ((DeclaredType) elem.asType()).toString();
+ break;
+ }
+ }
+ break;
+ }
+ }
+ return typeName;
+ }
+}
Added: workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/xml/XmlMetaMember.java
===================================================================
--- workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/xml/XmlMetaMember.java (rev 0)
+++ workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/xml/XmlMetaMember.java 2009-01-26 18:10:53 UTC (rev 13278)
@@ -0,0 +1,55 @@
+// $Id:$
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, Red Hat Middleware LLC, 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.jpa.metamodel.ap.xml;
+
+import org.jboss.jpa.metamodel.ap.IMetaMember;
+
+/**
+ * @author Hardy Ferentschik
+ */
+public abstract class XmlMetaMember implements IMetaMember {
+
+ private XmlMetaEntity parentEntity;
+
+ private String propertyName;
+
+ private String type;
+
+ XmlMetaMember(XmlMetaEntity parent, String propertyName, String type) {
+ this.parentEntity = parent;
+ this.propertyName = propertyName;
+ this.type = type;
+ }
+
+
+ @Override
+ public String getDeclarationString() {
+ return "public static " + parentEntity.importType(getMetaType()) + "<" + parentEntity.importType(parentEntity.getQualifiedName()) + ", " + parentEntity.importType(getTypeDeclaration()) + "> " + getPropertyName() + ";";
+ }
+
+ public String getPropertyName() {
+ return propertyName;
+ }
+
+ public String getTypeDeclaration() {
+ return type;
+ }
+
+ @Override
+ abstract public String getMetaType();
+}
Modified: workspace/max/jpaap/test/src/META-INF/orm.xml
===================================================================
--- workspace/max/jpaap/test/src/META-INF/orm.xml 2009-01-26 18:00:58 UTC (rev 13277)
+++ workspace/max/jpaap/test/src/META-INF/orm.xml 2009-01-26 18:10:53 UTC (rev 13278)
@@ -13,6 +13,7 @@
<column name="fld_id"/>
</id>
<basic name="filled"></basic>
+ <basic name="date"></basic>
<one-to-many name="items" target-entity="Item" fetch="EAGER"> <!-- target-entity optional guess the type from the geenric-->
<cascade>
<cascade-persist/>
Modified: workspace/max/jpaap/test/src/Test.java
===================================================================
--- workspace/max/jpaap/test/src/Test.java 2009-01-26 18:00:58 UTC (rev 13277)
+++ workspace/max/jpaap/test/src/Test.java 2009-01-26 18:10:53 UTC (rev 13278)
@@ -11,6 +11,7 @@
import javax.jpa.criteria.Query;
import javax.jpa.criteria.QueryBuilder;
import javax.jpa.criteria.Root;
+import javax.jpa.metamodel.Entity;
import model.metamodel.Item_;
import model.metamodel.Order_;
Modified: workspace/max/jpaap/test/src/model/Order.java
===================================================================
--- workspace/max/jpaap/test/src/model/Order.java 2009-01-26 18:00:58 UTC (rev 13277)
+++ workspace/max/jpaap/test/src/model/Order.java 2009-01-26 18:10:53 UTC (rev 13278)
@@ -1,28 +1,28 @@
package model;
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
-@Entity
+//@Entity
public class Order {
- @Id
+ //@Id
long id;
- @OneToMany
+ //@OneToMany
Set<Item> items;
boolean filled;
Date date;
- @OneToMany
+ //@OneToMany
List<String> notes;
- @ManyToOne
+ //@ManyToOne
Shop shop;
}
Modified: workspace/max/jpaap/test/src/model/Product.java
===================================================================
--- workspace/max/jpaap/test/src/model/Product.java 2009-01-26 18:00:58 UTC (rev 13277)
+++ workspace/max/jpaap/test/src/model/Product.java 2009-01-26 18:10:53 UTC (rev 13278)
@@ -13,6 +13,8 @@
@Id
long id;
+
+ int test;
String description;
BigDecimal price;
15 years, 11 months
JBoss Tools SVN: r13277 - in trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects: TestWizards and 11 other directories.
by jbosstools-commits@lists.jboss.org
Author: dazarov
Date: 2009-01-26 13:00:58 -0500 (Mon, 26 Jan 2009)
New Revision: 13277
Added:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/.classpath
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/.project
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/.settings/
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/.settings/.jsdtscope
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/.settings/org.eclipse.jdt.core.prefs
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/.settings/org.eclipse.jst.common.project.facet.core.prefs
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/.settings/org.eclipse.wst.common.component
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/.settings/org.eclipse.wst.common.project.facet.core.xml
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/.settings/org.eclipse.wst.jsdt.ui.superType.container
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/.settings/org.eclipse.wst.jsdt.ui.superType.name
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/JavaSource/
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/JavaSource/demo/
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/JavaSource/demo/Messages.properties
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/JavaSource/demo/User.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/META-INF/
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/META-INF/MANIFEST.MF
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/classes/
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/classes/demo/
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/classes/demo/Messages.properties
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/classes/demo/User.class
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/faces-config.xml
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/lib/
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/lib/common-annotations.jar
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/lib/commons-beanutils.jar
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/lib/commons-collections.jar
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/lib/commons-digester.jar
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/lib/commons-logging.jar
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/lib/jsf-tlds.jar
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/lib/jstl.jar
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/lib/standard.jar
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/web.xml
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/index.jsp
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/pages/
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/pages/hello.jsp
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/pages/inputUserName.jsp
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/ant/
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/ant/build.properties
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/ant/build.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-3500
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/.classpath
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/.classpath (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/.classpath 2009-01-26 18:00:58 UTC (rev 13277)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="JavaSource"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+ <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget/JBoss 4.2 Runtime"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre1.5.0_10"/>
+ <classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
+</classpath>
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/.classpath
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/.project
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/.project (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/.project 2009-01-26 18:00:58 UTC (rev 13277)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>TestWizards</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.common.verification.verifybuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.jboss.tools.jsf.jsfnature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/.project
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/.settings/.jsdtscope
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/.settings/.jsdtscope (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/.settings/.jsdtscope 2009-01-26 18:00:58 UTC (rev 13277)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+ <classpathentry kind="output" path=""/>
+</classpath>
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/.settings/org.eclipse.jdt.core.prefs 2009-01-26 18:00:58 UTC (rev 13277)
@@ -0,0 +1,7 @@
+#Fri Jan 23 19:40:36 MSK 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/.settings/org.eclipse.jst.common.project.facet.core.prefs
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/.settings/org.eclipse.jst.common.project.facet.core.prefs (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/.settings/org.eclipse.jst.common.project.facet.core.prefs 2009-01-26 18:00:58 UTC (rev 13277)
@@ -0,0 +1,4 @@
+#Fri Jan 23 19:40:37 MSK 2009
+classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType\:\:jre1.5.0_10/owners=jst.java\:5.0
+classpath.helper/org.eclipse.jst.server.core.container\:\:org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget\:\:JBoss\ 4.2\ Runtime/owners=jst.web\:2.5
+eclipse.preferences.version=1
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/.settings/org.eclipse.jst.common.project.facet.core.prefs
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/.settings/org.eclipse.wst.common.component (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/.settings/org.eclipse.wst.common.component 2009-01-26 18:00:58 UTC (rev 13277)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+<wb-module deploy-name="TestWizards">
+<wb-resource deploy-path="/" source-path="/WebContent"/>
+<wb-resource deploy-path="/WEB-INF/classes" source-path="/JavaSource"/>
+<property name="context-root" value="TestWizards"/>
+<property name="java-output-path"/>
+</wb-module>
+</project-modules>
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/.settings/org.eclipse.wst.common.project.facet.core.xml 2009-01-26 18:00:58 UTC (rev 13277)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <runtime name="JBoss 4.2 Runtime"/>
+ <fixed facet="jst.web"/>
+ <fixed facet="jst.java"/>
+ <installed facet="jst.java" version="5.0"/>
+ <installed facet="jst.web" version="2.5"/>
+</faceted-project>
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/.settings/org.eclipse.wst.common.project.facet.core.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/.settings/org.eclipse.wst.jsdt.ui.superType.container
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/.settings/org.eclipse.wst.jsdt.ui.superType.container 2009-01-26 18:00:58 UTC (rev 13277)
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/.settings/org.eclipse.wst.jsdt.ui.superType.name
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/.settings/org.eclipse.wst.jsdt.ui.superType.name 2009-01-26 18:00:58 UTC (rev 13277)
@@ -0,0 +1 @@
+Window
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/JavaSource/demo/Messages.properties
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/JavaSource/demo/Messages.properties (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/JavaSource/demo/Messages.properties 2009-01-26 18:00:58 UTC (rev 13277)
@@ -0,0 +1,3 @@
+header=Hello Demo Application
+prompt_message=Name:
+hello_message=Hello
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/JavaSource/demo/Messages.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/JavaSource/demo/User.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/JavaSource/demo/User.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/JavaSource/demo/User.java 2009-01-26 18:00:58 UTC (rev 13277)
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Exadel, Inc. and 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:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package demo;
+
+/**
+ * Created by JBoss Developer Studio
+ */
+public class User {
+
+ private String name;
+
+ /**
+ * @return User Name
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * @param User Name
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
+}
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/JavaSource/demo/User.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/META-INF/MANIFEST.MF (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/META-INF/MANIFEST.MF 2009-01-26 18:00:58 UTC (rev 13277)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/META-INF/MANIFEST.MF
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/classes/demo/Messages.properties
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/classes/demo/Messages.properties (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/classes/demo/Messages.properties 2009-01-26 18:00:58 UTC (rev 13277)
@@ -0,0 +1,3 @@
+header=Hello Demo Application
+prompt_message=Name:
+hello_message=Hello
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/classes/demo/Messages.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/classes/demo/User.class
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/classes/demo/User.class
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/faces-config.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/faces-config.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/faces-config.xml 2009-01-26 18:00:58 UTC (rev 13277)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
+ <managed-bean>
+ <description>User Name Bean</description>
+ <managed-bean-name>user</managed-bean-name>
+ <managed-bean-class>demo.User</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ <managed-property>
+ <property-name>name</property-name>
+ <property-class>java.lang.String</property-class>
+ <value/>
+ </managed-property>
+ </managed-bean>
+ <navigation-rule>
+ <from-view-id>/pages/inputUserName.jsp</from-view-id>
+ <navigation-case>
+ <from-outcome>hello</from-outcome>
+ <to-view-id>/pages/hello.jsp</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+ <application>
+ <locale-config/>
+ </application>
+ <factory/>
+ <lifecycle/>
+</faces-config>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/faces-config.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/lib/common-annotations.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/lib/common-annotations.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/lib/commons-beanutils.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/lib/commons-beanutils.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/lib/commons-collections.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/lib/commons-collections.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/lib/commons-digester.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/lib/commons-digester.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/lib/commons-logging.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/lib/commons-logging.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/lib/jsf-tlds.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/lib/jsf-tlds.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/lib/jstl.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/lib/jstl.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/lib/standard.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/lib/standard.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/web.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/web.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/web.xml 2009-01-26 18:00:58 UTC (rev 13277)
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ <display-name>TestWizards</display-name>
+ <context-param>
+ <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+ <param-value>server</param-value>
+ </context-param>
+ <listener>
+ <listener-class>com.sun.faces.config.ConfigureListener</listener-class>
+ </listener>
+ <!-- Faces Servlet -->
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <!-- Faces Servlet Mapping -->
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>*.jsf</url-pattern>
+ </servlet-mapping>
+ <login-config>
+ <auth-method>BASIC</auth-method>
+ </login-config>
+</web-app>
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/web.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/index.jsp
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/index.jsp (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/index.jsp 2009-01-26 18:00:58 UTC (rev 13277)
@@ -0,0 +1,7 @@
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+
+<html>
+ <body>
+ <jsp:forward page="/pages/inputUserName.jsf" />
+ </body>
+</html>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/index.jsp
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/pages/hello.jsp
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/pages/hello.jsp (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/pages/hello.jsp 2009-01-26 18:00:58 UTC (rev 13277)
@@ -0,0 +1,20 @@
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+
+<f:loadBundle var="Message" basename="demo.Messages" />
+
+<html>
+ <head>
+ <title>Hello!</title>
+ </head>
+
+ <body>
+ <f:view>
+ <h3>
+ <h:outputText value="#{Message.hello_message}" />,
+ <h:outputText value="#{user.name}" />!
+ </h3>
+ </f:view>
+ </body>
+
+</html>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/pages/hello.jsp
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/pages/inputUserName.jsp
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/pages/inputUserName.jsp (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/pages/inputUserName.jsp 2009-01-26 18:00:58 UTC (rev 13277)
@@ -0,0 +1,28 @@
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+
+<f:loadBundle var="Message" basename="demo.Messages"/>
+
+<html>
+ <head>
+ <title>Input User Name Page</title>
+ </head>
+ <body>
+
+ <f:view>
+ <h1><h:outputText value="#{Message.header}"/></h1>
+
+ <h:messages style="color: red"/>
+
+ <h:form id="greetingForm">
+ <h:outputText value="#{Message.prompt_message}"/>
+ <h:inputText value="#{user.name}" required="true">
+ <f:validateLength maximum="30" minimum="3"/>
+ </h:inputText>
+
+ <h:commandButton action="hello" value="Say Hello!" />
+
+ </h:form>
+ </f:view>
+ </body>
+</html>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/pages/inputUserName.jsp
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/ant/build.properties
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/ant/build.properties (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/ant/build.properties 2009-01-26 18:00:58 UTC (rev 13277)
@@ -0,0 +1,3 @@
+#
+#Fri Jan 23 19:40:34 MSK 2009
+classpath.external=
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/ant/build.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/ant/build.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/ant/build.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/ant/build.xml 2009-01-26 18:00:58 UTC (rev 13277)
@@ -0,0 +1,74 @@
+<project name="KickStart" default="deploy" basedir="../">
+
+ <!-- Project settings -->
+ <property file="${basedir}/ant/build.properties" />
+
+ <property name="project.name" value="KickStart" />
+ <property name="web.content.dir" value="${basedir}/WebContent" />
+ <property name="web-inf.dir" value="${web.content.dir}/WEB-INF" />
+ <property name="build.dir" value="build" />
+ <property name="war.name" value="${build.dir}/${project.name}.war" />
+
+ <!-- Define a folder for deployment -->
+ <property name="deploy.dir" value="deploy" />
+
+ <!-- Compile classpath -->
+ <path id="compile.classpath">
+ <fileset dir="${webinf.dir}/lib">
+ <include name="**/*.jar" />
+ </fileset>
+ <pathelement path="${classpath}" />
+ <pathelement path="${classpath.external}" />
+ <pathelement path="${webinf.dir}/classes" />
+ </path>
+
+ <!-- Copy any resource or configuration files -->
+ <target name="copyResources">
+ <copy todir="${web-inf.dir}/classes" includeEmptyDirs="no">
+ <fileset dir="JavaSource">
+ <patternset>
+ <include name="**/*.*" />
+ <exclude name="**/*.java" />
+ </patternset>
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- Check timestamp on files -->
+ <target name="prepare">
+ <tstamp />
+ </target>
+
+ <!-- Remove classes directory for clean build -->
+ <target name="clean" description="Prepare for clean build">
+ <delete dir="${web-inf.dir}/classes" failonerror="false"/>
+ <mkdir dir="${web-inf.dir}/classes" />
+ </target>
+
+ <!-- Normal build of application -->
+ <target name="compile" depends="prepare, copyResources">
+ <javac srcdir="JavaSource" destdir="${web-inf.dir}/classes">
+ <classpath refid="compile.classpath" />
+ </javac>
+ </target>
+
+ <!-- Build Project -->
+ <target name="build" depends="prepare, compile" />
+
+ <!-- Rebuild Project -->
+ <target name="rebuild" depends="clean, prepare, compile" />
+
+ <!-- Build WAR -->
+ <target name="war" depends="build">
+ <mkdir dir="${build.dir}" />
+ <war warfile="${war.name}" basedir="${web.content.dir}" webxml="${web-inf.dir}/web.xml">
+ <exclude name="WEB-INF/web.xml" />
+ </war>
+ </target>
+
+ <target name="deploy" depends="war">
+ <delete dir="${deploy.dir}/${project.name}" failonerror="false"/>
+ <copy file="${war.name}" todir="${deploy.dir}" />
+ </target>
+
+</project>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/ant/build.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 11 months
JBoss Tools SVN: r13276 - trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test.
by jbosstools-commits@lists.jboss.org
Author: dazarov
Date: 2009-01-26 12:58:58 -0500 (Mon, 26 Jan 2009)
New Revision: 13276
Added:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/WizardTest.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/CssClassNewWizardTest.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/CssFileNewWizardTest.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/FacesConfigNewWizardTest.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/HtmlFileNewWizardTest.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsFileNewWizardTest.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JspFileNewWizardTest.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/PropertiesNewWizardTest.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/XhtmlFileNewWizardTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3500
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/CssClassNewWizardTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/CssClassNewWizardTest.java 2009-01-26 15:58:57 UTC (rev 13275)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/CssClassNewWizardTest.java 2009-01-26 17:58:58 UTC (rev 13276)
@@ -1,31 +1,11 @@
package org.jboss.tools.jsf.ui.test;
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.ui.PlatformUI;
-import org.jboss.tools.common.util.WorkbenchUtils;
-import junit.framework.TestCase;
-
-public class CssClassNewWizardTest extends TestCase {
+public class CssClassNewWizardTest extends WizardTest {
+ public CssClassNewWizardTest(){
+ super("org.jboss.tools.jst.web.ui.wizards.newfile.NewCSSClassWizard");
+ }
public void testCssClassNewWizardTestIsCreated() {
- IWizard
- aWizard = WorkbenchUtils.findWizardByDefId("org.jboss.tools.jst.web.ui.wizards.newfile.NewCSSClassWizard");
-
- WizardDialog dialog = new WizardDialog(
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
- aWizard);
- dialog.setBlockOnOpen(false);
- dialog.open();
- try {
- IWizardPage startPage = aWizard.getStartingPage();
- assertNotNull(startPage);
- }catch(Exception ex){
- fail(ex.getMessage());
- } finally {
- dialog.close();
- }
-
+ wizardIsCreated();
}
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/CssFileNewWizardTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/CssFileNewWizardTest.java 2009-01-26 15:58:57 UTC (rev 13275)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/CssFileNewWizardTest.java 2009-01-26 17:58:58 UTC (rev 13276)
@@ -1,31 +1,11 @@
package org.jboss.tools.jsf.ui.test;
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.ui.PlatformUI;
-import org.jboss.tools.common.util.WorkbenchUtils;
-import junit.framework.TestCase;
-
-public class CssFileNewWizardTest extends TestCase {
+public class CssFileNewWizardTest extends WizardTest {
+ public CssFileNewWizardTest(){
+ super("org.jboss.tools.jst.web.ui.wizards.newfile.NewCSSFileWizard");
+ }
public void testCssFileNewWizardTestIsCreated() {
- IWizard
- aWizard = WorkbenchUtils.findWizardByDefId("org.jboss.tools.jst.web.ui.wizards.newfile.NewCSSFileWizard");
-
- WizardDialog dialog = new WizardDialog(
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
- aWizard);
- dialog.setBlockOnOpen(false);
- dialog.open();
- try {
- IWizardPage startPage = aWizard.getStartingPage();
- assertNotNull(startPage);
- }catch(Exception ex){
- fail(ex.getMessage());
- } finally {
- dialog.close();
- }
-
+ wizardIsCreated();
}
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/FacesConfigNewWizardTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/FacesConfigNewWizardTest.java 2009-01-26 15:58:57 UTC (rev 13275)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/FacesConfigNewWizardTest.java 2009-01-26 17:58:58 UTC (rev 13276)
@@ -1,95 +1,47 @@
package org.jboss.tools.jsf.ui.test;
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.ui.PlatformUI;
import org.jboss.tools.common.util.WorkbenchUtils;
-import org.jboss.tools.test.util.JobUtils;
-import org.jboss.tools.test.util.ProjectImportTestSetup;
-import org.jboss.tools.test.util.ResourcesUtils;
-public class FacesConfigNewWizardTest extends TestCase {
- private IProject project;
+
+public class FacesConfigNewWizardTest extends WizardTest {
+ public FacesConfigNewWizardTest(){
+ super("org.jboss.tools.jsf.ui.wizard.newfile.NewFacesConfigFileWizard");
+ }
-// @Override
-// protected void setUp() throws Exception {
-// super.setUp();
-//
-// project = (IProject)ResourcesPlugin.getWorkspace().getRoot().findMember("TestWizards");
-// if(project == null) {
-// ProjectImportTestSetup setup = new ProjectImportTestSetup(
-// this,
-// "org.jboss.tools.jsf.ui.test",
-// "projects/TestWizards",
-// "TestWizards");
-// project = setup.importProject();
-// }
-// this.project = project.getProject();
-//
-// JobUtils.waitForIdle();
-// }
-
-// @Override
-// protected void tearDown() throws Exception {
-// boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
-// try {
-// JobUtils.waitForIdle();
-// if(project != null){
-// project.close(new NullProgressMonitor());
-// project.delete(true, new NullProgressMonitor());
-// project = null;
-// JobUtils.waitForIdle();
-// }
-// } finally {
-// ResourcesUtils.setBuildAutomatically(saveAutoBuild);
-// }
-//
-// }
-
public void testNewFacesConfigNewWizardIsCreated() {
- IWizard
- aWizard = WorkbenchUtils.findWizardByDefId("org.jboss.tools.jsf.ui.wizard.newfile.NewFacesConfigFileWizard");
-
- WizardDialog dialog = new WizardDialog(
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
- aWizard);
- dialog.setBlockOnOpen(false);
- dialog.open();
- try {
- IWizardPage startPage = aWizard.getStartingPage();
- assertNotNull(startPage);
- }catch(Exception ex){
- fail(ex.getMessage());
- } finally {
- dialog.close();
- }
-
+ wizardIsCreated();
}
public void testFacesConfigNewWizardValidation() {
+ IWizard wizard = WorkbenchUtils.findWizardByDefId(id);
+
+
+ System.out.println("Wizard - "+wizard.getClass());
+ boolean canFinish = wizard.canFinish();
+
// Assert Finish button is enabled by default if wizard is called on Project
+ assertTrue("Finish button is disabled at first wizard page.", canFinish);
+
// Assert Finish button is disabled and error is present if
// Folder field is empty
// All other fields are correct
+
// Assert Finish button is disabled and error is present if
// Folder field points to folder that doesn't exist
// All other fields are correct
+
// Assert Finish button is disabled and error is present if
// Folder field is correct
// Name field is empty
+
// Assert Finish button is disabled and error is present if
// Folder field is correct
// Name field contains forbidden characters
+
// Assert Finish button is disabled and error is present if
// Folder field is correct
// Name field contains file name that already exists
- fail("Not implemented yet");
}
public void testFacesConfigNewWizardResults() {
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/HtmlFileNewWizardTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/HtmlFileNewWizardTest.java 2009-01-26 15:58:57 UTC (rev 13275)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/HtmlFileNewWizardTest.java 2009-01-26 17:58:58 UTC (rev 13276)
@@ -1,31 +1,12 @@
package org.jboss.tools.jsf.ui.test;
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.ui.PlatformUI;
-import org.jboss.tools.common.util.WorkbenchUtils;
-import junit.framework.TestCase;
-
-public class HtmlFileNewWizardTest extends TestCase {
+public class HtmlFileNewWizardTest extends WizardTest {
+ public HtmlFileNewWizardTest(){
+ super("org.jboss.tools.common.model.ui.wizard.newfile.NewHTMLFileWizard");
+ }
+
public void testHtmlFileNewWizardTestIsCreated() {
- IWizard
- aWizard = WorkbenchUtils.findWizardByDefId("org.jboss.tools.common.model.ui.wizard.newfile.NewHTMLFileWizard");
-
- WizardDialog dialog = new WizardDialog(
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
- aWizard);
- dialog.setBlockOnOpen(false);
- dialog.open();
- try {
- IWizardPage startPage = aWizard.getStartingPage();
- assertNotNull(startPage);
- }catch(Exception ex){
- fail(ex.getMessage());
- } finally {
- dialog.close();
- }
-
+ wizardIsCreated();
}
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsFileNewWizardTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsFileNewWizardTest.java 2009-01-26 15:58:57 UTC (rev 13275)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsFileNewWizardTest.java 2009-01-26 17:58:58 UTC (rev 13276)
@@ -1,31 +1,12 @@
package org.jboss.tools.jsf.ui.test;
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.ui.PlatformUI;
-import org.jboss.tools.common.util.WorkbenchUtils;
-import junit.framework.TestCase;
-
-public class JsFileNewWizardTest extends TestCase {
+public class JsFileNewWizardTest extends WizardTest {
+ public JsFileNewWizardTest(){
+ super("org.jboss.tools.jst.web.ui.wizards.newfile.NewJSFileWizard");
+ }
+
public void testJsFileNewWizardTestIsCreated() {
- IWizard
- aWizard = WorkbenchUtils.findWizardByDefId("org.jboss.tools.jst.web.ui.wizards.newfile.NewJSFileWizard");
-
- WizardDialog dialog = new WizardDialog(
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
- aWizard);
- dialog.setBlockOnOpen(false);
- dialog.open();
- try {
- IWizardPage startPage = aWizard.getStartingPage();
- assertNotNull(startPage);
- }catch(Exception ex){
- fail(ex.getMessage());
- } finally {
- dialog.close();
- }
-
+ wizardIsCreated();
}
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JspFileNewWizardTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JspFileNewWizardTest.java 2009-01-26 15:58:57 UTC (rev 13275)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JspFileNewWizardTest.java 2009-01-26 17:58:58 UTC (rev 13276)
@@ -1,31 +1,12 @@
package org.jboss.tools.jsf.ui.test;
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.ui.PlatformUI;
-import org.jboss.tools.common.util.WorkbenchUtils;
-import junit.framework.TestCase;
-
-public class JspFileNewWizardTest extends TestCase {
+public class JspFileNewWizardTest extends WizardTest {
+ public JspFileNewWizardTest(){
+ super("org.jboss.tools.common.model.ui.wizard.newfile.NewJSPFileWizard");
+ }
+
public void testJspFileNewWizardTestIsCreated() {
- IWizard
- aWizard = WorkbenchUtils.findWizardByDefId("org.jboss.tools.common.model.ui.wizard.newfile.NewJSPFileWizard");
-
- WizardDialog dialog = new WizardDialog(
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
- aWizard);
- dialog.setBlockOnOpen(false);
- dialog.open();
- try {
- IWizardPage startPage = aWizard.getStartingPage();
- assertNotNull(startPage);
- }catch(Exception ex){
- fail(ex.getMessage());
- } finally {
- dialog.close();
- }
-
+ wizardIsCreated();
}
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/PropertiesNewWizardTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/PropertiesNewWizardTest.java 2009-01-26 15:58:57 UTC (rev 13275)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/PropertiesNewWizardTest.java 2009-01-26 17:58:58 UTC (rev 13276)
@@ -1,31 +1,12 @@
package org.jboss.tools.jsf.ui.test;
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.ui.PlatformUI;
-import org.jboss.tools.common.util.WorkbenchUtils;
-import junit.framework.TestCase;
-
-public class PropertiesNewWizardTest extends TestCase {
+public class PropertiesNewWizardTest extends WizardTest {
+ public PropertiesNewWizardTest(){
+ super("org.jboss.tools.common.model.ui.wizard.newfile.NewPropertiesFileWizard");
+ }
+
public void testPropertiesFileNewWizardTestIsCreated() {
- IWizard
- aWizard = WorkbenchUtils.findWizardByDefId("org.jboss.tools.common.model.ui.wizard.newfile.NewPropertiesFileWizard");
-
- WizardDialog dialog = new WizardDialog(
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
- aWizard);
- dialog.setBlockOnOpen(false);
- dialog.open();
- try {
- IWizardPage startPage = aWizard.getStartingPage();
- assertNotNull(startPage);
- }catch(Exception ex){
- fail(ex.getMessage());
- } finally {
- dialog.close();
- }
-
+ wizardIsCreated();
}
}
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/WizardTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/WizardTest.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/WizardTest.java 2009-01-26 17:58:58 UTC (rev 13276)
@@ -0,0 +1,78 @@
+package org.jboss.tools.jsf.ui.test;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jface.wizard.IWizard;
+import org.eclipse.jface.wizard.IWizardPage;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.ui.PlatformUI;
+import org.jboss.tools.common.util.WorkbenchUtils;
+import org.jboss.tools.test.util.JobUtils;
+import org.jboss.tools.test.util.ProjectImportTestSetup;
+import org.jboss.tools.test.util.ResourcesUtils;
+
+public abstract class WizardTest extends TestCase {
+ protected String id;
+ private IProject project;
+
+ public WizardTest(String id){
+ this.id = id;
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ project = (IProject)ResourcesPlugin.getWorkspace().getRoot().findMember("TestWizards");
+ if(project == null) {
+ ProjectImportTestSetup setup = new ProjectImportTestSetup(
+ this,
+ "org.jboss.tools.jsf.ui.test",
+ "projects/TestWizards",
+ "TestWizards");
+ project = setup.importProject();
+ }
+ this.project = project.getProject();
+ System.out.println("Project - "+project);
+ JobUtils.waitForIdle();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
+ try {
+ JobUtils.waitForIdle();
+ if(project != null){
+ project.close(new NullProgressMonitor());
+ project.delete(true, new NullProgressMonitor());
+ project = null;
+ JobUtils.waitForIdle();
+ }
+ } finally {
+ ResourcesUtils.setBuildAutomatically(saveAutoBuild);
+ }
+
+ }
+
+ public void wizardIsCreated() {
+ IWizard wizard = WorkbenchUtils.findWizardByDefId(id);
+
+ WizardDialog dialog = new WizardDialog(
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
+ wizard);
+ dialog.setBlockOnOpen(false);
+ dialog.open();
+ try {
+ IWizardPage startPage = wizard.getStartingPage();
+ assertNotNull(startPage);
+ }catch(Exception ex){
+ fail(ex.getMessage());
+ } finally {
+ dialog.close();
+ }
+
+ }
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/WizardTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/XhtmlFileNewWizardTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/XhtmlFileNewWizardTest.java 2009-01-26 15:58:57 UTC (rev 13275)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/XhtmlFileNewWizardTest.java 2009-01-26 17:58:58 UTC (rev 13276)
@@ -1,31 +1,12 @@
package org.jboss.tools.jsf.ui.test;
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.ui.PlatformUI;
-import org.jboss.tools.common.util.WorkbenchUtils;
-import junit.framework.TestCase;
-
-public class XhtmlFileNewWizardTest extends TestCase {
+public class XhtmlFileNewWizardTest extends WizardTest {
+ public XhtmlFileNewWizardTest(){
+ super("org.jboss.tools.common.model.ui.wizard.newfile.NewXHTMLFileWizard");
+ }
+
public void testXhtmlFileNewWizardTestIsCreated() {
- IWizard
- aWizard = WorkbenchUtils.findWizardByDefId("org.jboss.tools.common.model.ui.wizard.newfile.NewXHTMLFileWizard");
-
- WizardDialog dialog = new WizardDialog(
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
- aWizard);
- dialog.setBlockOnOpen(false);
- dialog.open();
- try {
- IWizardPage startPage = aWizard.getStartingPage();
- assertNotNull(startPage);
- }catch(Exception ex){
- fail(ex.getMessage());
- } finally {
- dialog.close();
- }
-
+ wizardIsCreated();
}
}
15 years, 11 months
JBoss Tools SVN: r13275 - in branches/jbosstools-3.0.0.CR2: jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3632 and 4 other directories.
by jbosstools-commits@lists.jboss.org
Author: mareshkau
Date: 2009-01-26 10:58:57 -0500 (Mon, 26 Jan 2009)
New Revision: 13275
Added:
branches/jbosstools-3.0.0.CR2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3632/
branches/jbosstools-3.0.0.CR2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3632/home.xhtml
branches/jbosstools-3.0.0.CR2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3632/layout/
branches/jbosstools-3.0.0.CR2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3632/layout/menu.xhtml
branches/jbosstools-3.0.0.CR2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3632/layout/template.xhtml
branches/jbosstools-3.0.0.CR2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3632Test.java
Modified:
branches/jbosstools-3.0.0.CR2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
branches/jbosstools-3.0.0.CR2/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/NodesManagingUtil.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3632
Added: branches/jbosstools-3.0.0.CR2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3632/home.xhtml
===================================================================
--- branches/jbosstools-3.0.0.CR2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3632/home.xhtml (rev 0)
+++ branches/jbosstools-3.0.0.CR2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3632/home.xhtml 2009-01-26 15:58:57 UTC (rev 13275)
@@ -0,0 +1,35 @@
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:s="http://jboss.com/products/seam/taglib"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:rich="http://richfaces.org/rich"
+ template="layout/template.xhtml">
+
+<ui:define name="body">
+
+ <h:messages globalOnly="true" styleClass="message"/>
+
+ <rich:panel>
+ <f:facet name="header">Welcome!</f:facet><h:outputText value=""/>
+ <p>This empty shell application includes:</p>
+ <ul>
+ <h:outputText value="" />
+ <li>Ant build script</li>
+ <li>Deployment to JBoss AS (EAR or WAR)</li>
+ <li>Development and production profiles</li>
+ <li>Integration testing using TestNG and Embedded JBoss</li>
+ <li>JavaBean or EJB 3.0 Seam components</li>
+ <li>JPA entity classes</li>
+ <li>A configurable DataSource and JPA EntityManager</li>
+ <li>Templated Facelets views</li>
+ <li>RichFaces panels and tables</li>
+ <li>Default CSS stylesheet</li>
+ <li>Internationalization support</li>
+ </ul>
+ </rich:panel>
+
+</ui:define>
+</ui:composition>
Added: branches/jbosstools-3.0.0.CR2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3632/layout/menu.xhtml
===================================================================
--- branches/jbosstools-3.0.0.CR2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3632/layout/menu.xhtml (rev 0)
+++ branches/jbosstools-3.0.0.CR2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3632/layout/menu.xhtml 2009-01-26 15:58:57 UTC (rev 13275)
@@ -0,0 +1,18 @@
+<rich:toolBar
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:s="http://jboss.com/products/seam/taglib"
+ xmlns:rich="http://richfaces.org/rich">
+ <rich:toolBarGroup>
+ <h:outputText value="#{projectName}:"/>
+ <s:link view="/home.xhtml" value="Home"/>
+ </rich:toolBarGroup>
+ <!-- @newMenuItem@ -->
+ <rich:toolBarGroup location="right">
+ <h:outputText value="Welcome, #{identity.username}!" rendered="#{identity.loggedIn}"/>
+ <s:link view="/login.xhtml" value="Login" rendered="#{not identity.loggedIn}"/>
+ <s:link view="/home.xhtml" action="#{identity.logout}" value="Logout" rendered="#{identity.loggedIn}"/>
+ </rich:toolBarGroup>
+</rich:toolBar>
Added: branches/jbosstools-3.0.0.CR2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3632/layout/template.xhtml
===================================================================
--- branches/jbosstools-3.0.0.CR2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3632/layout/template.xhtml (rev 0)
+++ branches/jbosstools-3.0.0.CR2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3632/layout/template.xhtml 2009-01-26 15:58:57 UTC (rev 13275)
@@ -0,0 +1,30 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:s="http://jboss.com/products/seam/taglib">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <title>jbide3632</title>
+ <link href="stylesheet/theme.css" rel="stylesheet" type="text/css" />
+</head>
+
+<body>
+
+ <ui:include src="menu.xhtml">
+ <ui:param name="projectName" value="jbide3632"/>
+ </ui:include>
+
+ <div class="body">
+ <ui:insert name="body"/>
+ </div>
+
+ <div class="footer">
+ Powered by <a href="http://jboss.com/products/seam">Seam</a>.
+ Generated by seam-gen.
+ </div>
+
+</body>
+</html>
Modified: branches/jbosstools-3.0.0.CR2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
===================================================================
--- branches/jbosstools-3.0.0.CR2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2009-01-26 15:56:28 UTC (rev 13274)
+++ branches/jbosstools-3.0.0.CR2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2009-01-26 15:58:57 UTC (rev 13275)
@@ -49,6 +49,7 @@
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3441Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3473Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3482Test;
+import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3632Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE675Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE788Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE924Test;
@@ -123,6 +124,7 @@
suite.addTestSuite(JBIDE3376Test.class);
suite.addTestSuite(JBIDE3396Test.class);
suite.addTestSuite(JBIDE3482Test.class);
+ suite.addTestSuite(JBIDE3632Test.class);
// $JUnit-END$
// added by Max Areshkau
Added: branches/jbosstools-3.0.0.CR2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3632Test.java
===================================================================
--- branches/jbosstools-3.0.0.CR2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3632Test.java (rev 0)
+++ branches/jbosstools-3.0.0.CR2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3632Test.java 2009-01-26 15:58:57 UTC (rev 13275)
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2009 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jsf.vpe.jsf.test.jbide;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.part.FileEditorInput;
+import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.vpe.ui.test.TestUtil;
+import org.jboss.tools.vpe.ui.test.VpeTest;
+
+/**
+ * @author mareshkau
+ *
+ */
+public class JBIDE3632Test extends VpeTest {
+
+ public JBIDE3632Test(String name) {
+ super(name);
+ }
+
+ public void testJBIDE3632Test() throws Throwable {
+ setException(null);
+ IFile ifile = (IFile) TestUtil.getComponentPath("JBIDE/3632/home.xhtml", //$NON-NLS-1$
+ JsfAllTests.IMPORT_PROJECT_NAME);
+ IEditorInput input = new FileEditorInput(ifile);
+ JSPMultiPageEditor part = openEditor(input);
+ //wait for initialization of editor
+ TestUtil.getVpeController(part);
+ int position = TestUtil.getLinePositionOffcet(part.getSourceEditor().getTextViewer(), 19, 26);
+ // sets selection for h:outputText
+ part.getSourceEditor().getTextViewer().getTextWidget().setCaretOffset(position);
+ // delete one of "
+ part.getSourceEditor().getTextViewer().getTextWidget().replaceTextRange(position, 1, ""); //$NON-NLS-1$
+ //wait while update job will be running
+ TestUtil.delay(600);
+ closeEditors();
+ if(getException()!=null) {
+ throw getException();
+ }
+ }
+
+}
Modified: branches/jbosstools-3.0.0.CR2/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/NodesManagingUtil.java
===================================================================
--- branches/jbosstools-3.0.0.CR2/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/NodesManagingUtil.java 2009-01-26 15:56:28 UTC (rev 13274)
+++ branches/jbosstools-3.0.0.CR2/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/NodesManagingUtil.java 2009-01-26 15:58:57 UTC (rev 13275)
@@ -71,7 +71,8 @@
*/
public static int getNodeLength(Node node) {
- if (node instanceof IDOMAttr) {
+ if ( (node instanceof IDOMAttr)
+ && (((IDOMAttr) node).getValueSource()!=null) ) {
return ((IDOMAttr) node).getValueSource().length();
} else if (node instanceof IndexedRegion) {
return ((IndexedRegion) node).getEndOffset()
15 years, 11 months
JBoss Tools SVN: r13274 - 22.01.2009 and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: anis
Date: 2009-01-26 10:56:28 -0500 (Mon, 26 Jan 2009)
New Revision: 13274
Added:
trunk/documentation/qa/reports/Tests 22.01.2009/FileManagement_26.01.2009.htm
Log:
Added a file remotely
Added: trunk/documentation/qa/reports/Tests 22.01.2009/FileManagement_26.01.2009.htm
===================================================================
--- trunk/documentation/qa/reports/Tests 22.01.2009/FileManagement_26.01.2009.htm (rev 0)
+++ trunk/documentation/qa/reports/Tests 22.01.2009/FileManagement_26.01.2009.htm 2009-01-26 15:56:28 UTC (rev 13274)
@@ -0,0 +1,165 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML><HEAD><TITLE>File Management</TITLE>
+<STYLE>H1 {
+ COLOR: #4a5d75; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; BACKGROUND-COLOR: transparent
+}
+H2 {
+ COLOR: #4a5d75; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; BACKGROUND-COLOR: transparent
+}
+TR {
+ BACKGROUND-COLOR: #f5f5f5
+}
+TD {
+ BORDER-RIGHT: dimgray 1px solid; PADDING-RIGHT: 0.5em; BORDER-TOP: dimgray 1px solid; PADDING-LEFT: 0.5em; PADDING-BOTTOM: 0.15em; BORDER-LEFT: dimgray 1px solid; PADDING-TOP: 0.15em; BORDER-BOTTOM: dimgray 1px solid; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; BACKGROUND-COLOR: transparent
+}
+HR {
+ COLOR: #999; BORDER-COLLAPSE: collapse
+}
+BODY {
+ PADDING-RIGHT: 2em; PADDING-LEFT: 2em; FONT-SIZE: 12px; PADDING-BOTTOM: 0em; COLOR: #333; LINE-HEIGHT: 100%; PADDING-TOP: 0em; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; max-width: 55em
+}
+TABLE {
+ BORDER-RIGHT: dimgray 0px solid; BORDER-TOP: dimgray 0px solid; BORDER-LEFT: dimgray 0px solid; COLOR: #4a5d75; BORDER-BOTTOM: dimgray 0px solid; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif
+}
+</STYLE>
+
+<META http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+<META content="MSHTML 6.00.2900.3059" name=GENERATOR></HEAD>
+<BODY bgColor=#f5f5f5>
+<CENTER>
+<H1>File Management</H1>
+<TABLE
+style="BORDER-TOP-WIDTH: 1pt; BORDER-LEFT-WIDTH: 1pt; BORDER-BOTTOM-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"
+cellSpacing=0 cellPadding=4 width="100%" align=center>
+ <TBODY>
+ <TR bgColor=gray>
+ <TD><B>Plan: Test Name</B></TD>
+ <TD><B>Status</B></TD>
+ <TD><B>Bug Number</B></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Create and
+ Edit ANT file</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: red; BORDER-RIGHT-WIDTH: 1pt">Failed</TD>
+ <TD
+style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">JBIDE-3634</TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Create and
+ Edit Any Extension file</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Create and
+ Edit Css file</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Create and
+ Edit Faces Config file</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Create and
+ Edit Hibernate 3.0 Configuration file</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Create and
+ Edit Hibernate 3.0 file</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Create and
+ Edit HTML file</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Create and
+ Edit JS file</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Create and
+ Edit JSP file</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Create and
+ Edit Properties file</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Create and
+ Edit Seam Components file</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Create and
+ Edit Struts Config file</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Create and
+ Edit Tag Library file</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Create and
+ Edit Tiles file</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Create and
+ Edit Validation file</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Create and
+ Edit Web Descriptor file</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Create and
+ Edit XHTML file</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Create and
+ Edit XML file</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white
+size=1> </FONT></TD></TR></TBODY></TABLE></CENTER></BODY></HTML>
15 years, 11 months
JBoss Tools SVN: r13273 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide.
by jbosstools-commits@lists.jboss.org
Author: mareshkau
Date: 2009-01-26 10:47:31 -0500 (Mon, 26 Jan 2009)
New Revision: 13273
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3632Test.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3632, junit test
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3632Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3632Test.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3632Test.java 2009-01-26 15:47:31 UTC (rev 13273)
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2009 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jsf.vpe.jsf.test.jbide;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.part.FileEditorInput;
+import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.vpe.ui.test.TestUtil;
+import org.jboss.tools.vpe.ui.test.VpeTest;
+
+/**
+ * @author mareshkau
+ *
+ */
+public class JBIDE3632Test extends VpeTest {
+
+ public JBIDE3632Test(String name) {
+ super(name);
+ }
+
+ public void testJBIDE3632Test() throws Throwable {
+ setException(null);
+ IFile ifile = (IFile) TestUtil.getComponentPath("JBIDE/3632/home.xhtml", //$NON-NLS-1$
+ JsfAllTests.IMPORT_PROJECT_NAME);
+ IEditorInput input = new FileEditorInput(ifile);
+ JSPMultiPageEditor part = openEditor(input);
+ //wait for initialization of editor
+ TestUtil.getVpeController(part);
+ int position = TestUtil.getLinePositionOffcet(part.getSourceEditor().getTextViewer(), 19, 26);
+ // sets selection for h:outputText
+ part.getSourceEditor().getTextViewer().getTextWidget().setCaretOffset(position);
+ // delete one of "
+ part.getSourceEditor().getTextViewer().getTextWidget().replaceTextRange(position, 1, ""); //$NON-NLS-1$
+ //wait while update job will be running
+ TestUtil.delay(600);
+ closeEditors();
+ if(getException()!=null) {
+ throw getException();
+ }
+ }
+
+}
15 years, 11 months
JBoss Tools SVN: r13272 - in trunk: jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3632 and 3 other directories.
by jbosstools-commits@lists.jboss.org
Author: mareshkau
Date: 2009-01-26 10:38:59 -0500 (Mon, 26 Jan 2009)
New Revision: 13272
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3632/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3632/home.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3632/layout/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3632/layout/menu.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3632/layout/template.xhtml
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/NodesManagingUtil.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3632
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3632/home.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3632/home.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3632/home.xhtml 2009-01-26 15:38:59 UTC (rev 13272)
@@ -0,0 +1,35 @@
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:s="http://jboss.com/products/seam/taglib"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:rich="http://richfaces.org/rich"
+ template="layout/template.xhtml">
+
+<ui:define name="body">
+
+ <h:messages globalOnly="true" styleClass="message"/>
+
+ <rich:panel>
+ <f:facet name="header">Welcome!</f:facet><h:outputText value=""/>
+ <p>This empty shell application includes:</p>
+ <ul>
+ <h:outputText value="" />
+ <li>Ant build script</li>
+ <li>Deployment to JBoss AS (EAR or WAR)</li>
+ <li>Development and production profiles</li>
+ <li>Integration testing using TestNG and Embedded JBoss</li>
+ <li>JavaBean or EJB 3.0 Seam components</li>
+ <li>JPA entity classes</li>
+ <li>A configurable DataSource and JPA EntityManager</li>
+ <li>Templated Facelets views</li>
+ <li>RichFaces panels and tables</li>
+ <li>Default CSS stylesheet</li>
+ <li>Internationalization support</li>
+ </ul>
+ </rich:panel>
+
+</ui:define>
+</ui:composition>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3632/layout/menu.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3632/layout/menu.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3632/layout/menu.xhtml 2009-01-26 15:38:59 UTC (rev 13272)
@@ -0,0 +1,18 @@
+<rich:toolBar
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:s="http://jboss.com/products/seam/taglib"
+ xmlns:rich="http://richfaces.org/rich">
+ <rich:toolBarGroup>
+ <h:outputText value="#{projectName}:"/>
+ <s:link view="/home.xhtml" value="Home"/>
+ </rich:toolBarGroup>
+ <!-- @newMenuItem@ -->
+ <rich:toolBarGroup location="right">
+ <h:outputText value="Welcome, #{identity.username}!" rendered="#{identity.loggedIn}"/>
+ <s:link view="/login.xhtml" value="Login" rendered="#{not identity.loggedIn}"/>
+ <s:link view="/home.xhtml" action="#{identity.logout}" value="Logout" rendered="#{identity.loggedIn}"/>
+ </rich:toolBarGroup>
+</rich:toolBar>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3632/layout/template.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3632/layout/template.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3632/layout/template.xhtml 2009-01-26 15:38:59 UTC (rev 13272)
@@ -0,0 +1,30 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:s="http://jboss.com/products/seam/taglib">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <title>jbide3632</title>
+ <link href="stylesheet/theme.css" rel="stylesheet" type="text/css" />
+</head>
+
+<body>
+
+ <ui:include src="menu.xhtml">
+ <ui:param name="projectName" value="jbide3632"/>
+ </ui:include>
+
+ <div class="body">
+ <ui:insert name="body"/>
+ </div>
+
+ <div class="footer">
+ Powered by <a href="http://jboss.com/products/seam">Seam</a>.
+ Generated by seam-gen.
+ </div>
+
+</body>
+</html>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2009-01-26 15:30:13 UTC (rev 13271)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2009-01-26 15:38:59 UTC (rev 13272)
@@ -49,6 +49,7 @@
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3441Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3473Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3482Test;
+import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3632Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE675Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE788Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE924Test;
@@ -123,6 +124,7 @@
suite.addTestSuite(JBIDE3376Test.class);
suite.addTestSuite(JBIDE3396Test.class);
suite.addTestSuite(JBIDE3482Test.class);
+ suite.addTestSuite(JBIDE3632Test.class);
// $JUnit-END$
// added by Max Areshkau
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/NodesManagingUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/NodesManagingUtil.java 2009-01-26 15:30:13 UTC (rev 13271)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/NodesManagingUtil.java 2009-01-26 15:38:59 UTC (rev 13272)
@@ -71,7 +71,8 @@
*/
public static int getNodeLength(Node node) {
- if (node instanceof IDOMAttr) {
+ if ( (node instanceof IDOMAttr)
+ && (((IDOMAttr) node).getValueSource()!=null) ) {
return ((IDOMAttr) node).getValueSource().length();
} else if (node instanceof IndexedRegion) {
return ((IndexedRegion) node).getEndOffset()
15 years, 11 months
JBoss Tools SVN: r13271 - in trunk/documentation/whatsnew: as and 4 other directories.
by jbosstools-commits@lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2009-01-26 10:30:13 -0500 (Mon, 26 Jan 2009)
New Revision: 13271
Added:
trunk/documentation/whatsnew/as/as-news-2.0.0.CR2.html
trunk/documentation/whatsnew/esb/esb-news-1.1.0.CR2.html
trunk/documentation/whatsnew/images/change_seam_parent.png
trunk/documentation/whatsnew/images/dragndrop_jboss_serversview.png
trunk/documentation/whatsnew/images/enable_folding_vpe.png
trunk/documentation/whatsnew/images/explore_server_view.png
trunk/documentation/whatsnew/images/navigation_page_dialog.png
trunk/documentation/whatsnew/images/new_css_dialog_perf.png
trunk/documentation/whatsnew/images/restore_defaults_palette.png
trunk/documentation/whatsnew/images/seam_pages_editor_preferences.png
trunk/documentation/whatsnew/images/strict_launchconfig.png
trunk/documentation/whatsnew/images/tabbed_pagedesign_options.png
trunk/documentation/whatsnew/images/vpe_code_folding.png
trunk/documentation/whatsnew/images/xmlmenu_src.png
trunk/documentation/whatsnew/seam/seam-news-2.0.0.CR2.html
trunk/documentation/whatsnew/vpe/vpe-news-3.0.0.CR2.html
Modified:
trunk/documentation/whatsnew/index.html
Log:
update nn for 3.0.0.CR2
Added: trunk/documentation/whatsnew/as/as-news-2.0.0.CR2.html
===================================================================
--- trunk/documentation/whatsnew/as/as-news-2.0.0.CR2.html (rev 0)
+++ trunk/documentation/whatsnew/as/as-news-2.0.0.CR2.html 2009-01-26 15:30:13 UTC (rev 13271)
@@ -0,0 +1,110 @@
+<html>
+
+<head>
+<link rel="stylesheet" href="../whatsnew.css">
+<title>JBoss AS Tools 2.0.0.CR2 News</title>
+</head>
+
+<body>
+
+<h1>JBoss AS Tools 2.0.0.CR2 - New and Noteworthy</h1>
+
+<p align="right"><a href="../index.html">< Main Index</a> <a href="../vpe/vpe-news-3.0.0.CR2.html">Visual Page Editor ></a></p>
+
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+
+ <tr>
+ <td colspan="2">
+ <hr>
+ <h3>Views</h3>
+ <hr>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="left">
+ <p align="right">
+ <b>Drag'n'Drop to JBoss Server View</b></td>
+ <td valign="top">
+ <p>JBoss Server View now supports drag'n'drop of deployable and runnable projects/resources.</p>
+ <p>This means that if you...
+
+ <ul>
+ <li>drag a project to a server it will deploy it to the
+ server and run it by showing the main page in a
+ browser</li>
+ <li>dragging a .xhtml file from WebContent will do the same
+ and show the corresponding page in a browser</li>
+ <li>dragging a deployable resource (i.e. a datasource
+ (-ds.xml) file that has been made deployable) will simply deploy
+ that resource directly to the server.</li>
+ </ul>
+
+ ...in short it does the same thing as if you used "Run On Server" or "Add and Remove projects" just with fewer clicks.
+
+ </p>
+
+ <p><img src="../images/dragndrop_jboss_serversview.png"/></p>
+
+ <p><small><a href="https://jira.jboss.org/jira/browse/JBIDE-3608">Related jira</a></small></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="left">
+ <p align="right">
+ <b>'Explore' shortcut in Server view</b></td>
+ <td valign="top">
+ <p>There is now an "Explore" item in the context menu of JBoss
+ servers and its deployed resources/projects. This action uses
+ the native OS file explorer to browse the deploy
+ destination.</p>
+
+ <p><img src="../images/explore_server_view.png"/></p>
+
+ <p><small><a href="https://jira.jboss.org/jira/browse/JBIDE-3087">Related jira</a></small></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr>
+ <h3>Setup/Configuration</h3>
+ <hr>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="left">
+ <p align="right">
+ <b>More strict server launches</b></td>
+ <td valign="top">
+ <p>To avoid inconsistencies between server's and their configured runtime the Launch Configurations for JBoss Servers are now more strict in enforcing the configured values in the server.</p>
+ <p>For example if you change the launch configuration program arguments to "-c myConfig" but do not change the targeted runtime configuration then your program arguments will be ignored. The server runtime "wins" so to speak. This ensures consistency and if you i.e. change the location of the runtime your launch configurations will automatically pick that up.</p>
+
+ <p>Values not controlled by the server and its runtime setup will be passed on unaltered.</p>
+
+ <p><img src="../images/strict_launchconfig.png"/></p>
+
+ <p><small><a href="https://jira.jboss.org/jira/browse/JBIDE-3073">Related jira</a></small></p>
+ </td>
+ </tr>
+
+
+
+
+
+
+</table>
+
+</body>
+
+</html>
+
+
Added: trunk/documentation/whatsnew/esb/esb-news-1.1.0.CR2.html
===================================================================
--- trunk/documentation/whatsnew/esb/esb-news-1.1.0.CR2.html (rev 0)
+++ trunk/documentation/whatsnew/esb/esb-news-1.1.0.CR2.html 2009-01-26 15:30:13 UTC (rev 13271)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Language" content="en-us" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" href="../whatsnew.css"/>
+<title>ESB tools 1.1.0.CR2 What's New</title>
+</head>
+<body>
+<h1>ESB tools 1.1.0.CR2 What's New</h1>
+
+<p align="right"><a href="../index.html">< Main Index</a> <a href="../hibernate/hibernate-news-3.2.4.CR2.html">Hibernate Tools ></a></p>
+
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+
+ <tr>
+ <td colspan="2">
+ <hr/>
+ <h3>Editors</h3>
+ <hr/>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>XSD</b></td>
+ <td valign="top">
+ <p>The schema used behind ESB editor now uses the latest version available (from SOA-P 4.3). This removes the errors/warnings some users have reported seeing when using SOA-P specific esb.xml files.</p>
+
+ <p><small><a href="https://jira.jboss.org/jira/browse/JBIDE-3556">Related Jira</a></small></p>
+ </td>
+ </tr>
+
+
+</table>
+
+</body>
+
+</html>
+
+
Added: trunk/documentation/whatsnew/images/change_seam_parent.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/images/change_seam_parent.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/images/dragndrop_jboss_serversview.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/images/dragndrop_jboss_serversview.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/images/enable_folding_vpe.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/images/enable_folding_vpe.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/images/explore_server_view.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/images/explore_server_view.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/images/navigation_page_dialog.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/images/navigation_page_dialog.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/images/new_css_dialog_perf.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/images/new_css_dialog_perf.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/images/restore_defaults_palette.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/images/restore_defaults_palette.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/images/seam_pages_editor_preferences.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/images/seam_pages_editor_preferences.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/images/strict_launchconfig.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/images/strict_launchconfig.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/images/tabbed_pagedesign_options.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/images/tabbed_pagedesign_options.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/images/vpe_code_folding.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/images/vpe_code_folding.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/images/xmlmenu_src.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/images/xmlmenu_src.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/documentation/whatsnew/index.html
===================================================================
--- trunk/documentation/whatsnew/index.html 2009-01-26 14:40:04 UTC (rev 13270)
+++ trunk/documentation/whatsnew/index.html 2009-01-26 15:30:13 UTC (rev 13271)
@@ -1,200 +1,222 @@
-<html>
-
-<head>
-<link rel="stylesheet" href="whatsnew.css">
-<title>JBoss Tools News and Noteworthy</title>
-</head>
-
-<body>
-
-<h1>JBoss Tools News and Noteworthy</h1>
-
-<html>
-
-<table border="0" cellpadding="10" cellspacing="0" width="80%">
- <tr>
- <td colspan="2">
- <hr>
- <h3>JBoss Tools</h3>
- <hr>
- </td>
- </tr>
- <tr>
- <td valign="top" align="left">
- <p align="right"><b>3.0.0.CR1</b>
- <td valign="top">
- <p><a href="jmx/jmx-news-0.5.0.CR1.html">JMX Tools</a></p>
- <p><a href="esb/esb-news-1.1.0.CR1.html">JBoss ESB Tools</a></p>
- <p><a href="hibernate/hibernate-news-3.2.4.CR1.html">Hibernate Tools</a></p>
- <p><a href="as/as-news-2.0.0.CR1.html">JBoss AS Tools</a></p>
- <p><a href="vpe/vpe-news-3.0.0.CR1.html">Visual Page Editor</a></p>
- <p><a href="portlet/portlet-news-1.0.0.CR1.html">Portal Tools</a></p>
+<html>
+
+<head>
+<link rel="stylesheet" href="whatsnew.css">
+<title>JBoss Tools News and Noteworthy</title>
+</head>
+
+<body>
+
+<h1>JBoss Tools News and Noteworthy</h1>
+
+<html>
+
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+ <tr>
+ <td colspan="2">
+ <hr>
+ <h3>JBoss Tools</h3>
+ <hr>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="left">
+ <p align="right"><b>3.0.0.CR2</b>
+ <td valign="top">
+ <p><a href="as/as-news-2.0.0.CR2.html">JBoss AS Tools</a></p>
+ <p><a href="vpe/vpe-news-3.0.0.CR2.html">Visual Page Editor</a></p>
+ <p><a href="esb/esb-news-1.1.0.CR2.html">JBoss ESB Tools</a></p>
+ <p><a href="seam/seam-news-2.0.0.CR2.html">Seam Tools</a></p>
+
+
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="left">
+ <p align="right"><b>3.0.0.CR1</b>
+ <td valign="top">
+ <p><a href="jmx/jmx-news-0.5.0.CR1.html">JMX Tools</a></p>
+ <p><a href="esb/esb-news-1.1.0.CR1.html">JBoss ESB Tools</a></p>
+ <p><a href="hibernate/hibernate-news-3.2.4.CR1.html">Hibernate Tools</a></p>
+ <p><a href="as/as-news-2.0.0.CR1.html">JBoss AS Tools</a></p>
+ <p><a href="vpe/vpe-news-3.0.0.CR1.html">Visual Page Editor</a></p>
+ <p><a href="portlet/portlet-news-1.0.0.CR1.html">Portal Tools</a></p>
<p><a href="examples/examples-news-1.0.0.CR1.html">Examples</a></p>
- <p><a href="seam/seam-news-2.0.0.CR1.html">Seam Tools</a></p>
- </td>
- </tr>
+ <p><a href="seam/seam-news-2.0.0.CR1.html">Seam Tools</a></p>
+ </td>
+ </tr>
- <tr>
- <td valign="top" align="left">
- <p align="right"><b>3.0.0.Beta1</b>
- <td valign="top">
- <p><a href="core/core-news-3.0.0.Beta1.html">Core/General</a></p>
- <p><a href="seam/seam-news-2.0.0.Beta1.html">Seam Tools</a></p>
- <p><a href="hibernate/hibernate-news-3.2.4.Beta1.html">Hibernate Tools</a></p>
- <p><a href="as/as-news-2.0.0.Beta1.html">JBoss AS Tools</a></p>
- <p><a href="portlet/portlet-news-1.0.0.Beta1.html">Portal Tools</a></p>
- <p><a href="vpe/vpe-news-3.0.0.Beta1.html">Visual Page Editor</a></p>
- <p><a href="esb/esb-news-1.1.0.Beta1.html">JBoss ESB Tools</a></p>
- <p><a href="smooks/smooks-news-1.0.0.Beta1.html">Smooks Tools</a></p>
+ <tr>
+ <td valign="top" align="left">
+ <p align="right"><b>3.0.0.Beta1</b>
+ <td valign="top">
+ <p><a href="core/core-news-3.0.0.Beta1.html">Core/General</a></p>
+ <p><a href="seam/seam-news-2.0.0.Beta1.html">Seam Tools</a></p>
+ <p><a href="hibernate/hibernate-news-3.2.4.Beta1.html">Hibernate Tools</a></p>
+ <p><a href="as/as-news-2.0.0.Beta1.html">JBoss AS Tools</a></p>
+ <p><a href="portlet/portlet-news-1.0.0.Beta1.html">Portal Tools</a></p>
+ <p><a href="vpe/vpe-news-3.0.0.Beta1.html">Visual Page Editor</a></p>
+ <p><a href="esb/esb-news-1.1.0.Beta1.html">JBoss ESB Tools</a></p>
+ <p><a href="smooks/smooks-news-1.0.0.Beta1.html">Smooks Tools</a></p>
<p><a href="examples/examples-news-1.0.0.Beta1.html">Examples</a></p>
- </td>
- </tr>
-
- <tr>
- <td valign="top" align="left">
- <p align="right"><b>3.0.0.Alpha1</b>
- <td valign="top">
- <p><a href="core/core-news-3.0.0.Alpha1.html">Core/General</a></p>
- <p><a href="seam/seam-news-2.0.0.Alpha1.html">Seam Tools</a></p>
- <p><a href="hibernate/hibernate-news-3.2.4.Alpha1.html">Hibernate Tools</a></p>
- <p><a href="as/as-news-2.0.0.Alpha1.html">JBoss AS Tools</a></p>
- <p><a href="portlet/portlet-news-1.0.0.Alpha1.html">Portal Tools</a></p>
-
- <p><a href="ws/ws-news-1.0.0.Alpha1.html">Web Services</a></p>
- <p><a href="birt/birt-news-1.0.0.Alpha1.html">Birt Tools</a></p>
-
- <p><a href="vpe/vpe-news-3.0.0.Alpha1.html">Visual Page Editor</a></p>
-
- </td>
- </tr>
- <tr>
- <td valign="top" align="left">
- <p align="right"><b>2.1.0.GA</b>
- <td valign="top"><p>Bugfixes, no new major features</p></td>
- </td>
- </tr>
- <tr>
- <td valign="top" align="left">
- <p align="right"><b>2.1.0.CR1</b>
- <td valign="top">
- <p><a href="vpe/vpe-news-2.1.0.CR1.html">Visual Page Editor</a></p>
- <p><a href="seam/seam-news-1.1.0.CR1.html">Seam Tools</a></p>
- </td>
- </td>
- </tr>
- <tr>
- <td valign="top" align="left">
- <p align="right"><b>2.1.0.beta1</b>
- <td valign="top">
- <p><a href="esb/esb-news-1.0.0.beta1.html">JBoss ESB Tools</a></p>
- <p><a href="as/as-news-1.1.0.beta1.html">JBoss AS Tools</a></p>
- <p><a href="seam/seam-news-1.1.0.beta1.html">Seam Tools</a></p>
- <p><a href="hibernate/hibernate-news-3.2.1.beta1.html">Hibernate Tools</a></p>
- <p><a href="vpe/vpe-news-2.1.0.beta1.html">Visual Page Editor</a></p>
- </td>
- </td>
- </tr>
- <tr>
- <td valign="top" align="left">
- <p align="right"><b>2.0.0.GA/2.0.1.GA</b>
- <td valign="top"><p>Bugfixes, no new major features</p></td>
- </td>
- </tr>
- <tr>
- <td valign="top" align="left">
- <p align="right"><b>Candidate Release 1</b></td>
- <td valign="top">
- <p><a href="as/as-news-1.0.0.cr1.html">JBoss AS Tools</a></p>
- <p><a href="seam/seam-news-1.0.0.cr1.html">Seam Tools</a></p>
- <p><a href="hibernate/hibernate-news-3.2.0.cr1.html">Hibernate Tools</a></p>
- <p><a href="vpe/vpe-news-2.0.0.cr1.html">Visual Page Editor</a></p>
- </td>
- </tr>
- <tr>
- <td valign="top" align="left">
- <p align="right"><b>Beta4</b></td>
- <td valign="top">
- <p><a href="as/as-news-1.0.0.beta4.html">JBoss AS Tools</a></p>
- <p><a href="seam/seam-news-1.0.0.beta2.html">Seam Tools</a></p>
- <p><a href="jst/jst-news-1.0.0.beta2.html">JST Tools</a></p>
- <p><a href="http://www.hibernate.org/hib_docs/tools/eclipse/newandnoteworthy/hibernat...">Hibernate Tools</a></p>
- </td>
- </tr>
- <tr>
- <td valign="top" align="left">
- <p align="right"><b>Beta3</b></td>
- <td valign="top">
- <p><a href="seam/seam-news-1.0.0.beta1.html">Seam Tools</a></p>
- </td>
- </tr>
- <tr>
- <td colspan="2">
- <hr/>
- <h3>JBoss Developer Studio</h3>
- <hr/>
- </td>
- </tr>
+ </td>
+ </tr>
- <tr>
- <td valign="top" align="left">
- <p align="right"><b>2.0.0.CR</b></td>
- <td valign="top">
- <p><a href="jbds/jbds-news-2.0.0.CR1.html">JBoss Developer Studio</a></p>
- </td>
- </tr>
- <tr>
- <td valign="top" align="left">
- <p align="right"><b>2.0.0.Beta1</b></td>
- <td valign="top">
- <p><a href="jbds/jbds-news-2.0.0.Beta1.html">JBoss Developer Studio</a></p>
- </td>
- </tr>
- <tr>
- <td valign="top" align="left">
- <p align="right"><b>1.1.0.GA</b></td>
- <td valign="top">
- <p>Bugfixes, no new major features</p>
- </td>
- </tr>
- <tr>
- <td valign="top" align="left">
- <p align="right"><b>1.1.0.CR1</b></td>
- <td valign="top">
- <p><a href="jbds/jbds-news-1.1.0.CR1.html">JBoss Developer Studio</a></p>
- </td>
- </tr>
- <tr>
- <td valign="top" align="left">
- <p align="right"><b>1.1.0.beta1</b></td>
- <td valign="top">
- <p><a href="jbds/jbds-news-1.1.0.beta1.html">JBoss Developer Studio</a></p>
- </td>
- </tr>
- <tr>
- <td valign="top" align="left">
- <p align="right"><b>1.0.0.GA</b></td>
- <td valign="top">
- <p>Red Hat Developer Studio renamed to JBoss Developer Studio</a></p>
- </td>
- </tr>
- <tr>
- <td valign="top" align="left">
- <p align="right"><b>Beta2</b></td>
- <td valign="top">
- <p><a href="rhds/rhds-news-1.0.0.beta2.html">Red Hat Developer Studio</a></p>
- </td>
- </tr>
- <tr>
- <td valign="top" align="left">
- <p align="right"><b>Beta1</b></td>
- <td valign="top">
- <p><a href="rhds/rhds-news-1.0.0.beta1.html">Red Hat Developer Studio</a></p>
- </td>
- </tr>
-</table>
-
-</body>
-
-</html>
-
-
+ <tr>
+ <td valign="top" align="left">
+ <p align="right"><b>3.0.0.Alpha1</b>
+ <td valign="top">
+ <p><a href="core/core-news-3.0.0.Alpha1.html">Core/General</a></p>
+ <p><a href="seam/seam-news-2.0.0.Alpha1.html">Seam Tools</a></p>
+ <p><a href="hibernate/hibernate-news-3.2.4.Alpha1.html">Hibernate Tools</a></p>
+ <p><a href="as/as-news-2.0.0.Alpha1.html">JBoss AS Tools</a></p>
+ <p><a href="portlet/portlet-news-1.0.0.Alpha1.html">Portal Tools</a></p>
+
+ <p><a href="ws/ws-news-1.0.0.Alpha1.html">Web Services</a></p>
+ <p><a href="birt/birt-news-1.0.0.Alpha1.html">Birt Tools</a></p>
+
+ <p><a href="vpe/vpe-news-3.0.0.Alpha1.html">Visual Page Editor</a></p>
+
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <p align="right"><b>2.1.0.GA</b>
+ <td valign="top"><p>Bugfixes, no new major features</p></td>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <p align="right"><b>2.1.0.CR1</b>
+ <td valign="top">
+ <p><a href="vpe/vpe-news-2.1.0.CR1.html">Visual Page Editor</a></p>
+ <p><a href="seam/seam-news-1.1.0.CR1.html">Seam Tools</a></p>
+ </td>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <p align="right"><b>2.1.0.beta1</b>
+ <td valign="top">
+ <p><a href="esb/esb-news-1.0.0.beta1.html">JBoss ESB Tools</a></p>
+ <p><a href="as/as-news-1.1.0.beta1.html">JBoss AS Tools</a></p>
+ <p><a href="seam/seam-news-1.1.0.beta1.html">Seam Tools</a></p>
+ <p><a href="hibernate/hibernate-news-3.2.1.beta1.html">Hibernate Tools</a></p>
+ <p><a href="vpe/vpe-news-2.1.0.beta1.html">Visual Page Editor</a></p>
+ </td>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <p align="right"><b>2.0.0.GA/2.0.1.GA</b>
+ <td valign="top"><p>Bugfixes, no new major features</p></td>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <p align="right"><b>Candidate Release 1</b></td>
+ <td valign="top">
+ <p><a href="as/as-news-1.0.0.cr1.html">JBoss AS Tools</a></p>
+ <p><a href="seam/seam-news-1.0.0.cr1.html">Seam Tools</a></p>
+ <p><a href="hibernate/hibernate-news-3.2.0.cr1.html">Hibernate Tools</a></p>
+ <p><a href="vpe/vpe-news-2.0.0.cr1.html">Visual Page Editor</a></p>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <p align="right"><b>Beta4</b></td>
+ <td valign="top">
+ <p><a href="as/as-news-1.0.0.beta4.html">JBoss AS Tools</a></p>
+ <p><a href="seam/seam-news-1.0.0.beta2.html">Seam Tools</a></p>
+ <p><a href="jst/jst-news-1.0.0.beta2.html">JST Tools</a></p>
+ <p><a href="http://www.hibernate.org/hib_docs/tools/eclipse/newandnoteworthy/hibernat...">Hibernate Tools</a></p>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <p align="right"><b>Beta3</b></td>
+ <td valign="top">
+ <p><a href="seam/seam-news-1.0.0.beta1.html">Seam Tools</a></p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr/>
+ <h3>JBoss Developer Studio</h3>
+ <hr/>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="left">
+ <p align="right"><b>2.0.0.CR2</b></td>
+ <td valign="top">
+ <p><a href="jbds/jbds-news-2.0.0.CR1.html">JBoss Developer Studio</a></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="left">
+ <p align="right"><b>2.0.0.CR1</b></td>
+ <td valign="top">
+ <p><a href="jbds/jbds-news-2.0.0.CR1.html">JBoss Developer Studio</a></p>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <p align="right"><b>2.0.0.Beta1</b></td>
+ <td valign="top">
+ <p><a href="jbds/jbds-news-2.0.0.Beta1.html">JBoss Developer Studio</a></p>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <p align="right"><b>1.1.0.GA</b></td>
+ <td valign="top">
+ <p>Bugfixes, no new major features</p>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <p align="right"><b>1.1.0.CR1</b></td>
+ <td valign="top">
+ <p><a href="jbds/jbds-news-1.1.0.CR1.html">JBoss Developer Studio</a></p>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <p align="right"><b>1.1.0.beta1</b></td>
+ <td valign="top">
+ <p><a href="jbds/jbds-news-1.1.0.beta1.html">JBoss Developer Studio</a></p>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <p align="right"><b>1.0.0.GA</b></td>
+ <td valign="top">
+ <p>Red Hat Developer Studio renamed to JBoss Developer Studio</a></p>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <p align="right"><b>Beta2</b></td>
+ <td valign="top">
+ <p><a href="rhds/rhds-news-1.0.0.beta2.html">Red Hat Developer Studio</a></p>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <p align="right"><b>Beta1</b></td>
+ <td valign="top">
+ <p><a href="rhds/rhds-news-1.0.0.beta1.html">Red Hat Developer Studio</a></p>
+ </td>
+ </tr>
+</table>
+
+</body>
+
+</html>
+
+
Added: trunk/documentation/whatsnew/seam/seam-news-2.0.0.CR2.html
===================================================================
--- trunk/documentation/whatsnew/seam/seam-news-2.0.0.CR2.html (rev 0)
+++ trunk/documentation/whatsnew/seam/seam-news-2.0.0.CR2.html 2009-01-26 15:30:13 UTC (rev 13271)
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Language" content="en-us" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" href="../whatsnew.css"/>
+<title>Seam tools 2.0.0.CR2 What's New</title>
+</head>
+<body>
+<h1>Seam tools 2.0.0.CR2 What's New</h1>
+
+<p align="right"><a href="../index.html">< Main Index</a> <a href="../as/as-news-2.0.0.CR2.html">JBoss AS Tools ></a></p>
+
+
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+ <tr>
+ <td colspan="2">
+ <hr/>
+ <h3>Projects</h3>
+ <hr/>
+ </td>
+ <tr>
+ <td valign="top" align="right">
+ <a name="itemnam2e" id="itemname2"></a><b>Change Seam parent project</b>
+ </td>
+ <td width="70%" valign="top">
+ <p>It is now possible to change the Seam parent project directly in Seam preferences. In earlier versions this was only controllable at project creation time, now it can be changed for existing projects too.</p>
+
+ <p><img src="../images/change_seam_parent.png"/></p>
+
+ <p><small><a href="https://jira.jboss.org/jira/browse/JBIDE-3535">Related Jira</a></small></p>
+
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr/>
+ <h3>Editors</h3>
+ <hr/>
+ </td>
+ <tr>
+ <td valign="top" align="right">
+ <a name="itemnam2e" id="itemname2"></a><b>Seam pages editor preferences</b>
+ </td>
+ <td width="70%" valign="top">
+ <p>There is now a preference page for controlling visual look and behavior of the Seam pages editor.</p>
+
+ <p><img src="../images/seam_pages_editor_preferences.png"/></p>
+
+ <p><small><a href="https://jira.jboss.org/jira/browse/JBIDE-3409">Related Jira</a></small></p>
+ </td>
+ </tr>
+
+
+ <tr>
+ <td colspan="2"><hr />
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="right">
+ <a name="itemnam2e" id="itemname2"></a><b>Easier view-id selection</b>
+ </td>
+ <td width="70%" valign="top">
+ <p>When editing properties of elements that point to view-id's the dialog now lists existing view-id's for quick selection.</p>
+
+ <p><img src="../images/navigation_page_dialog.png"/></p>
+
+ <p><small><a href="https://jira.jboss.org/jira/browse/JBIDE-3145">Related Jira</a></small></p>
+ </td>
+ </tr>
+
+
+
+
+
+
+
+</table>
+
+</body>
+
+</html>
+
+
Added: trunk/documentation/whatsnew/vpe/vpe-news-3.0.0.CR2.html
===================================================================
--- trunk/documentation/whatsnew/vpe/vpe-news-3.0.0.CR2.html (rev 0)
+++ trunk/documentation/whatsnew/vpe/vpe-news-3.0.0.CR2.html 2009-01-26 15:30:13 UTC (rev 13271)
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Language" content="en-us" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" href="../whatsnew.css"/>
+<title>What's New Visual Page Editor</title>
+</head>
+<body>
+<h1>What's New Visual Page Editor</h1>
+
+<p align="right"><a href="../index.html">< Main Index</a> <a href="../seam/seam-news-2.0.0.CR2.html">Seam Tools ></a></p>
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+ <tr>
+ <td colspan="2">
+ <hr/>
+ <h3>General</h3>
+ <hr/>
+ </td>
+
+ <tr>
+ <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Richfaces 3.3</b></td>
+ <td valign="top"><p>
+ Richfaces 3.3 is now supported in code completion and visual page editor.
+ </p>
+
+<p><small><a href="https://jira.jboss.org/jira/browse/JBIDE-3552">Related Jira</a></small></p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2"><hr />
+ </td>
+
+ <tr>
+ <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Restore Default for Palette</b></td>
+ <td valign="top"><p>
+ The palette preferences now have a 'Restore defaults' allowing you to pick up any new palette changes/additions.
+ </p>
+
+ <p><img src="../images/restore_defaults_palette.png"/></p>
+
+ <p><small><a href="https://jira.jboss.org/jira/browse/JBIDE-2712">Related Jira</a></small></p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2"><hr />
+ </td>
+
+ <tr>
+ <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Tabbed Page Design Option dialog </b></td>
+ <td valign="top"><p>
+ The dialog for Page Design Options now uses tab's instead of one big cluttered dialog plus it and the related dialogs are now resizable.
+ </p>
+
+ <p><img src="../images/tabbed_pagedesign_options.png"/></p>
+
+ <p><small><a href="https://jira.jboss.org/jira/browse/JBIDE-3443">Related Jira</a></small></p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2"><hr />
+ </td>
+
+ <tr>
+ <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>New CSS Dialog performance</b></td>
+ <td valign="top"><p>
+ The performance of the New CSS dialog have been improved so there no longer is a significant lag when editing certain attributes in the dialog.
+ </p>
+
+<p><img src="../images/new_css_dialog_perf.png"/></p>
+
+ <p><small><a href="https://jira.jboss.org/jira/browse/JBIDE-3329">Related Jira</a></small></p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2"><hr />
+ </td>
+
+ <tr>
+ <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>XML edit menu in Source part</b></td>
+ <td valign="top"><p>
+ The "Insert around", "Insert before", "Insert after", "Replace With" operations are now available in the source editor of Visual Page Editor.
+ Before they were only available in the visual part.
+ </p>
+
+<p><img src="../images/xmlmenu_src.png"/></p>
+
+ <p><small><a href="https://jira.jboss.org/jira/browse/JBIDE-2017">Related Jira</a></small></p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2"><hr />
+ </td>
+
+ <tr>
+ <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Folding in source editor</b></td>
+ <td valign="top">
+<p>The source editor in Visual Page Editor now supports code folding. It is enabled by right clicking in the margin and selecting the Folding menu.</p>
+<p><img src="../images/enable_folding_vpe.png"/></p>
+<p>When enabled all HTML and XHTML tags can be folded/unfolded by clicking on the -/+ signs in the margin. Note, this support goes beyound what the default
+XML and HTML editor in Eclipse which only support HTML tags and not namespace prefixed XML tags.</p>
+
+<p><img src="../images/vpe_code_folding.png"/></p>
+
+ <p><small><a href="https://jira.jboss.org/jira/browse/JBIDE-1977">Related Jira</a></small></p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2"><hr />
+ </td>
+
+
+
+
+
+
+
+
+
+
+
+
+</table>
+
+</body>
+
+</html>
+
+
15 years, 11 months
JBoss Tools SVN: r13270 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-01-26 09:40:04 -0500 (Mon, 26 Jan 2009)
New Revision: 13270
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ModuleActionProvider.java
Log:
JBIDE-3633
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ModuleActionProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ModuleActionProvider.java 2009-01-26 14:39:39 UTC (rev 13269)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ModuleActionProvider.java 2009-01-26 14:40:04 UTC (rev 13270)
@@ -11,6 +11,7 @@
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IContributionItem;
import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.Separator;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.swt.widgets.Shell;
@@ -69,6 +70,12 @@
ms[i] = (ModuleServer)arr[i];
this.selection = ms;
+ IContributionItem sep = menu.find(ServerActionProvider.CONTROL_MODULE_SECTION_END_SEPARATOR);
+ if( sep == null ) {
+ sep = new Separator(ServerActionProvider.CONTROL_MODULE_SECTION_END_SEPARATOR);
+ sep.setVisible(false);
+ menu.add(sep);
+ }
menu.insertBefore(ServerActionProvider.CONTROL_MODULE_SECTION_END_SEPARATOR, incrementalPublishModuleAction);
menu.insertBefore(ServerActionProvider.CONTROL_MODULE_SECTION_END_SEPARATOR, fullPublishModuleAction);
if (selection.size() == 1) {
15 years, 11 months