JBoss Tools SVN: r3010 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2007-08-09 08:21:53 -0400 (Thu, 09 Aug 2007)
New Revision: 3010
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelImageVisitor.java
Log:
http://jira.jboss.com/jira/browse/EXIN-427
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelImageVisitor.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelImageVisitor.java 2007-08-09 12:01:53 UTC (rev 3009)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelImageVisitor.java 2007-08-09 12:21:53 UTC (rev 3010)
@@ -58,13 +58,16 @@
public Object visitPersistentField(Property field, Object argument) {
if (field !=null){
+ if(field.getPersistentClass().getIdentifierProperty() == field){
+ return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldSimple_id")); //$NON-NLS-1$
+ }
try {
if (field.getType().isCollectionType()) {
return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldCollection")); //$NON-NLS-1$
}
} catch (Exception e) {}
}
- return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldNot_mapped")); //$NON-NLS-1$
+ return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldSimple")); //$NON-NLS-1$
}
public Object visitComponentMapping(Component mapping) {
18 years, 4 months
JBoss Tools SVN: r3009 - trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-08-09 08:01:53 -0400 (Thu, 09 Aug 2007)
New Revision: 3009
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/ScannerTest.java
Log:
EXIN-336 more tests added
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/ScannerTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/ScannerTest.java 2007-08-09 10:10:59 UTC (rev 3008)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/ScannerTest.java 2007-08-09 12:01:53 UTC (rev 3009)
@@ -33,6 +33,7 @@
import org.jboss.tools.seam.core.ISeamProject;
import org.jboss.tools.seam.core.ISeamProperty;
import org.jboss.tools.seam.core.ISeamXmlComponentDeclaration;
+import org.jboss.tools.seam.core.ISeamXmlFactory;
import org.jboss.tools.seam.core.ScopeType;
import org.jboss.tools.seam.core.SeamComponentMethodType;
import org.jboss.tools.seam.core.SeamCoreBuilder;
@@ -275,12 +276,10 @@
}
assertTrue("Factories are not found in jboss-seam.jar", factories != null && factories.length > 0);
- boolean hasActor = false;
- for (int i = 0; i < factories.length && !hasActor; i++) {
- if("actor".equals(factories[i].getName())) hasActor = true;
- }
-
- assertTrue("Factory " + "actor" + " is not found in jboss-seam.jar", hasActor);
+ // Test factory 'actor'
+ ISeamXmlFactory actor = (ISeamXmlFactory)find(factories, "actor");
+ assertTrue("Factory " + "actor" + " is not found in jboss-seam.jar", actor != null);
+ assertTrue("Factory " + "actor" + " loaded wrong value", "#{org.jboss.seam.core.actor}".equals(actor.getValue()));
try {
project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
@@ -289,14 +288,13 @@
fail("Cannot build");
}
- /*
- * After having tested details of library scanner now let us check
- * that it succeeded in build.
- */
+ //After having tested details of library scanner now let us check
+ //that it succeeded in build.
Set<ISeamFactory> components = seamProject.getFactoriesByName("actor");
assertTrue("Seam builder must put actor to project.", components.size()==1);
+ //Test components
//1. Test component declaration org.jboss.seam.core.dispatcher
@@ -318,7 +316,16 @@
assertTrue("Declared method 'shutdown' is not found in 'org.jboss.seam.core.ejb'", m != null);
assertTrue("Method 'shutdown' in 'org.jboss.seam.core.ejb' must be destroy method", m.isOfType(SeamComponentMethodType.DESTROY));
+ //3. Test component declaration org.jboss.seam.core.eventContext
+ d = (ISeamJavaComponentDeclaration)findDeclaration(componentDeclarations, "org.jboss.seam.core.eventContext");
+ assertTrue("Java declaration 'org.jboss.seam.core.eventContext' is not found", d != null);
+ methods = d.getMethods();
+ m = find(methods, "getContext");
+ assertTrue("Declared method 'getContext' is not found in 'org.jboss.seam.core.eventContext'", m != null);
+ assertTrue("Method 'getContext' in 'org.jboss.seam.core.eventContext' must be unwrap method", m.isOfType(SeamComponentMethodType.UNWRAP));
+
+
}
private ISeamComponentMethod find(Set<ISeamComponentMethod> methods, String name) {
@@ -328,6 +335,13 @@
return null;
}
+ private ISeamFactory find(ISeamFactory[] factories, String name) {
+ for (int i = 0; i < factories.length; i++) {
+ if("actor".equals(factories[i].getName())) return factories[i];
+ }
+ return null;
+ }
+
/**
* This method is to cover most cases of configuring components
*/
18 years, 4 months
JBoss Tools SVN: r3008 - trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-08-09 06:10:59 -0400 (Thu, 09 Aug 2007)
New Revision: 3008
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/ScannerTest.java
Log:
EXIN-336 - provided loading @Create, @Destroy, etc. annotated methods for binary scanner
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/ScannerTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/ScannerTest.java 2007-08-09 10:10:41 UTC (rev 3007)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/ScannerTest.java 2007-08-09 10:10:59 UTC (rev 3008)
@@ -22,16 +22,19 @@
import org.eclipse.core.runtime.NullProgressMonitor;
import org.jboss.tools.common.model.XJob;
import org.jboss.tools.common.test.util.TestProjectProvider;
+import org.jboss.tools.seam.core.BeanType;
import org.jboss.tools.seam.core.BijectedAttributeType;
import org.jboss.tools.seam.core.IBijectedAttribute;
import org.jboss.tools.seam.core.ISeamComponent;
import org.jboss.tools.seam.core.ISeamComponentDeclaration;
+import org.jboss.tools.seam.core.ISeamComponentMethod;
import org.jboss.tools.seam.core.ISeamFactory;
import org.jboss.tools.seam.core.ISeamJavaComponentDeclaration;
import org.jboss.tools.seam.core.ISeamProject;
import org.jboss.tools.seam.core.ISeamProperty;
import org.jboss.tools.seam.core.ISeamXmlComponentDeclaration;
import org.jboss.tools.seam.core.ScopeType;
+import org.jboss.tools.seam.core.SeamComponentMethodType;
import org.jboss.tools.seam.core.SeamCoreBuilder;
import org.jboss.tools.seam.core.event.ISeamValueList;
import org.jboss.tools.seam.core.event.ISeamValueMap;
@@ -39,6 +42,7 @@
import org.jboss.tools.seam.core.event.ISeamValueString;
import org.jboss.tools.seam.internal.core.SeamProject;
import org.jboss.tools.seam.internal.core.scanner.IFileScanner;
+import org.jboss.tools.seam.internal.core.scanner.LoadedDeclarations;
import org.jboss.tools.seam.internal.core.scanner.lib.ClassPath;
import org.jboss.tools.seam.internal.core.scanner.lib.LibraryScanner;
@@ -259,19 +263,21 @@
assertTrue("Scanner cannot recognise jboss-seam.jar", scanner.isRelevant(f));
assertTrue("Scanner cannot recognise jboss-seam.jar content", scanner.isLikelyComponentSource(f));
- ISeamFactory[] cs = null;
+ ISeamFactory[] factories = null;
+ ISeamJavaComponentDeclaration[] componentDeclarations = null;
try {
- cs = scanner.parse(f).getFactories().toArray(new ISeamFactory[0]);
+ LoadedDeclarations ds = scanner.parse(f);
+ factories = ds.getFactories().toArray(new ISeamFactory[0]);
+ componentDeclarations = ds.getComponents().toArray(new ISeamJavaComponentDeclaration[0]);
} catch (Exception e) {
- e.printStackTrace();
fail("Error in library scanner:" + e.getMessage());
}
- assertTrue("Factories are not found in jboss-seam.jar", cs != null && cs.length > 0);
+ assertTrue("Factories are not found in jboss-seam.jar", factories != null && factories.length > 0);
boolean hasActor = false;
- for (int i = 0; i < cs.length && !hasActor; i++) {
- if("actor".equals(cs[i].getName())) hasActor = true;
+ for (int i = 0; i < factories.length && !hasActor; i++) {
+ if("actor".equals(factories[i].getName())) hasActor = true;
}
assertTrue("Factory " + "actor" + " is not found in jboss-seam.jar", hasActor);
@@ -289,9 +295,39 @@
*/
Set<ISeamFactory> components = seamProject.getFactoriesByName("actor");
- assertTrue("Seam builder must put actor to project.", components.size()==1);
+ assertTrue("Seam builder must put actor to project.", components.size()==1);
+
+
+ //1. Test component declaration org.jboss.seam.core.dispatcher
+
+ ISeamJavaComponentDeclaration d = (ISeamJavaComponentDeclaration)findDeclaration(componentDeclarations, "org.jboss.seam.core.dispatcher");
+ assertTrue("Java declaration 'org.jboss.seam.core.dispatcher' is not found", d != null);
+ assertTrue("Java declaration 'org.jboss.seam.core.dispatcher' must be stateless", d.isOfType(BeanType.STATELESS));
+ assertTrue("Java declaration 'org.jboss.seam.core.dispatcher' must have precedence 0", d.getPrecedence() == 0);
+
+ //2. Test component declaration org.jboss.seam.core.ejb
+
+ d = (ISeamJavaComponentDeclaration)findDeclaration(componentDeclarations, "org.jboss.seam.core.ejb");
+ assertTrue("Java declaration 'org.jboss.seam.core.ejb' is not found", d != null);
+ assertTrue("Java declaration 'org.jboss.seam.core.dispatcher' must have precedence 0", d.getPrecedence() == 0);
+ Set<ISeamComponentMethod> methods = d.getMethods();
+ ISeamComponentMethod m = find(methods, "startup");
+ assertTrue("Declared method 'startup' is not found in 'org.jboss.seam.core.ejb'", m != null);
+ assertTrue("Method 'startup' in 'org.jboss.seam.core.ejb' must be create method", m.isOfType(SeamComponentMethodType.CREATE));
+ m = find(methods, "shutdown");
+ assertTrue("Declared method 'shutdown' is not found in 'org.jboss.seam.core.ejb'", m != null);
+ assertTrue("Method 'shutdown' in 'org.jboss.seam.core.ejb' must be destroy method", m.isOfType(SeamComponentMethodType.DESTROY));
+
+
}
+ private ISeamComponentMethod find(Set<ISeamComponentMethod> methods, String name) {
+ for (ISeamComponentMethod m : methods) {
+ if(name.equals(m.getSourceMember().getElementName())) return m;
+ }
+ return null;
+ }
+
/**
* This method is to cover most cases of configuring components
*/
18 years, 4 months
JBoss Tools SVN: r3007 - in trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner: lib and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-08-09 06:10:41 -0400 (Thu, 09 Aug 2007)
New Revision: 3007
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/java/ComponentBuilder.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/TypeScanner.java
Log:
EXIN-336 - provided loading @Create, @Destroy, etc. annotated methods for binary scanner
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/java/ComponentBuilder.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/java/ComponentBuilder.java 2007-08-09 09:37:26 UTC (rev 3006)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/java/ComponentBuilder.java 2007-08-09 10:10:41 UTC (rev 3007)
@@ -232,7 +232,6 @@
cm = new SeamComponentMethod();
component.addMethod(cm);
MethodDeclaration m = n.getNode();
- component.addMethod(cm);
IMethod im = findMethod(m);
cm.setSourceMember(im);
cm.setId(im);
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/TypeScanner.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/TypeScanner.java 2007-08-09 09:37:26 UTC (rev 3006)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/TypeScanner.java 2007-08-09 10:10:41 UTC (rev 3007)
@@ -1,7 +1,9 @@
package org.jboss.tools.seam.internal.core.scanner.lib;
import java.lang.reflect.Field;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import org.eclipse.core.runtime.IPath;
@@ -10,6 +12,8 @@
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.core.dom.Annotation;
+import org.eclipse.jdt.core.dom.MethodDeclaration;
import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;
import org.eclipse.jdt.internal.compiler.classfmt.ClassFileReader;
import org.eclipse.jdt.internal.compiler.env.EnumConstantSignature;
@@ -23,13 +27,16 @@
import org.jboss.tools.seam.core.BeanType;
import org.jboss.tools.seam.core.BijectedAttributeType;
import org.jboss.tools.seam.core.IValueInfo;
+import org.jboss.tools.seam.core.SeamComponentMethodType;
import org.jboss.tools.seam.core.SeamCorePlugin;
import org.jboss.tools.seam.internal.core.AbstractContextVariable;
import org.jboss.tools.seam.internal.core.BijectedAttribute;
import org.jboss.tools.seam.internal.core.SeamAnnotatedFactory;
+import org.jboss.tools.seam.internal.core.SeamComponentMethod;
import org.jboss.tools.seam.internal.core.SeamJavaComponentDeclaration;
import org.jboss.tools.seam.internal.core.scanner.LoadedDeclarations;
import org.jboss.tools.seam.internal.core.scanner.Util;
+import org.jboss.tools.seam.internal.core.scanner.java.AnnotatedASTNode;
import org.jboss.tools.seam.internal.core.scanner.java.SeamAnnotations;
import org.jboss.tools.seam.internal.core.scanner.java.ValueInfo;
@@ -181,11 +188,8 @@
if(a != null) {
processFactory(m, a, component, ds);
}
- IBinaryAnnotation in = map.get(IN_ANNOTATION_TYPE);
- IBinaryAnnotation out = map.get(OUT_ANNOTATION_TYPE);
- if(in != null || out != null) {
- processBijection(m, in, out, component, ds);
- }
+ processBijection(m, map, component, ds);
+ processComponentMethod(m, map, component, ds);
}
private void processFactory(IBinaryMethod m, IBinaryAnnotation a, SeamJavaComponentDeclaration component, LoadedDeclarations ds) {
@@ -212,22 +216,31 @@
}
}
- private void processBijection(IBinaryMethod m, IBinaryAnnotation in, IBinaryAnnotation out, SeamJavaComponentDeclaration component, LoadedDeclarations ds) {
- if(in == null && out == null) return;
+ private void processBijection(IBinaryMethod m, Map<String,IBinaryAnnotation> map, SeamJavaComponentDeclaration component, LoadedDeclarations ds) {
+ Map<BijectedAttributeType, IBinaryAnnotation> as = new HashMap<BijectedAttributeType, IBinaryAnnotation>();
+ List<BijectedAttributeType> types = new ArrayList<BijectedAttributeType>();
+ IBinaryAnnotation main = null;
+ for (int i = 0; i < BijectedAttributeType.values().length; i++) {
+ IBinaryAnnotation a = map.get(BijectedAttributeType.values()[i].getAnnotationType());
+ if(a != null) {
+ as.put(BijectedAttributeType.values()[i], a);
+ if(main == null) main = a;
+ types.add(BijectedAttributeType.values()[i]);
+ }
+ }
+ if(as.size() == 0) return;
+
BijectedAttribute att = new BijectedAttribute();
component.addBijectedAttribute(att);
- BijectedAttributeType[] types = (in == null) ? new BijectedAttributeType[]{BijectedAttributeType.OUT}
- : (out == null) ? new BijectedAttributeType[]{BijectedAttributeType.IN}
- : new BijectedAttributeType[]{BijectedAttributeType.IN, BijectedAttributeType.OUT};
- att.setTypes(types);
+ att.setTypes(types.toArray(new BijectedAttributeType[0]));
- String name = (String)getValue(in != null ? in : out, "value");
+ String name = (String)getValue(main, "value");
if(name == null || name.length() == 0) {
name = new String(m.getSelector());
}
att.setName(name);
- Object scope = getValue(in != null ? in : out, "scope");
+ Object scope = getValue(main, "scope");
if(scope != null) att.setScopeAsString(scope.toString());
IMember im = findIMethod(component, m);
@@ -235,6 +248,23 @@
}
+ void processComponentMethod(IBinaryMethod m, Map<String,IBinaryAnnotation> map, SeamJavaComponentDeclaration component, LoadedDeclarations ds) {
+ SeamComponentMethod cm = null;
+ for (int i = 0; i < SeamComponentMethodType.values().length; i++) {
+ SeamComponentMethodType type = SeamComponentMethodType.values()[i];
+ IBinaryAnnotation a = map.get(type.getAnnotationType());
+ if(a == null) continue;
+ if(cm == null) {
+ cm = new SeamComponentMethod();
+ component.addMethod(cm);
+ IMethod im = findIMethod(component, m);
+ cm.setSourceMember(im);
+ cm.setId(im);
+ }
+ cm.getTypes().add(type);
+ }
+ }
+
private String getValue(IBinaryAnnotation a, String method) {
try {
IBinaryElementValuePair[] ps = a.getElementValuePairs();
18 years, 4 months
JBoss Tools SVN: r3006 - trunk/seam/plugins/org.jboss.tools.seam.ui.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2007-08-09 05:37:26 -0400 (Thu, 09 Aug 2007)
New Revision: 3006
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/build.properties
Log:
http://jira.jboss.org/jira/browse/JBIDE-693
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/build.properties
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/build.properties 2007-08-09 09:29:14 UTC (rev 3005)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/build.properties 2007-08-09 09:37:26 UTC (rev 3006)
@@ -1,4 +1,5 @@
-source.. = src/
+source.. = src/,\
+ resources/
output.. = bin/
bin.includes = plugin.xml,\
META-INF/,\
18 years, 4 months
JBoss Tools SVN: r3005 - branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser.
by jbosstools-commits＠lists.jboss.org
Author: svasilyev
Date: 2007-08-09 05:29:14 -0400 (Thu, 09 Aug 2007)
New Revision: 3005
Modified:
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java
Log:
http://jira.jboss.org/jira/browse/EXIN-235 cosmetic fix
Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java 2007-08-09 09:28:45 UTC (rev 3004)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java 2007-08-09 09:29:14 UTC (rev 3005)
@@ -47,7 +47,7 @@
public class XulRunnerBrowser extends Composite implements nsIWebBrowserChrome,
nsIWebProgressListener, nsITooltipListener {
- private static String XULRUNNER_BUNDLE = "org.jboss.tools.vpe.xulrunner"; //$NON-NLS-1$
+ private static String XULRUNNER_BUNDLE = "org.jboss.tools.vpe.mozilla.xulrunner"; //$NON-NLS-1$
private static String XULRUNNER_ENTRY = "/xulrunner";
// TEMPORARY CODE (@see org.eclipse.swt.browser.Mozilla)
18 years, 4 months
JBoss Tools SVN: r3004 - trunk/documentation/GettingStartedGuide/docs/userguide/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: sabrashevich
Date: 2007-08-09 05:28:45 -0400 (Thu, 09 Aug 2007)
New Revision: 3004
Modified:
trunk/documentation/GettingStartedGuide/docs/userguide/en/modules/ManageJBossAS.xml
Log:
minor changes
Modified: trunk/documentation/GettingStartedGuide/docs/userguide/en/modules/ManageJBossAS.xml
===================================================================
--- trunk/documentation/GettingStartedGuide/docs/userguide/en/modules/ManageJBossAS.xml 2007-08-09 09:23:59 UTC (rev 3003)
+++ trunk/documentation/GettingStartedGuide/docs/userguide/en/modules/ManageJBossAS.xml 2007-08-09 09:28:45 UTC (rev 3004)
@@ -132,7 +132,7 @@
<orderedlist>
<listitem><para>Open the JBoss Server View by selecting Window > Show View > Other > Server > JBoss Server View. You will see JBoss Server view.</para></listitem>
<listitem><para>Right click anywhere in this view and select New Server.</para></listitem>
-<listitem><para>Select JBoss, a division of Red Hat > JBoss v4.2, click the "Installed Runtimes" button to select a new installed runtime and press Next.</para></listitem>
+<listitem><para>Select JBoss, a division of Red Hat > JBoss v4.2 and click the "Installed Runtimes" button to select a new installed runtime.</para></listitem>
</orderedlist>
<figure>
<title>Selecting server type</title>
@@ -149,7 +149,7 @@
</orderedlist>
<figure>
-<title>Selecting JBoss Runtime</title>
+<title>Installed Runtimes</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/jbossruntime2.png"/>
18 years, 4 months
JBoss Tools SVN: r3003 - in branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets: src/org/jboss/tools/jsf/vpe/facelets/template and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: svasilyev
Date: 2007-08-09 05:23:59 -0400 (Thu, 09 Aug 2007)
New Revision: 3003
Modified:
branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/META-INF/MANIFEST.MF
branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeCompositionTemplate.java
branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDecorateTemplate.java
branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDefineContainerTemplate.java
branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDefineTemplate.java
branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeInsertTemplate.java
Log:
http://jira.jboss.org/jira/browse/EXIN-235 old nsIDOM* interfaces were replaced
Modified: branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/META-INF/MANIFEST.MF 2007-08-09 09:12:47 UTC (rev 3002)
+++ branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/META-INF/MANIFEST.MF 2007-08-09 09:23:59 UTC (rev 3003)
@@ -12,7 +12,8 @@
org.jboss.tools.common,
org.jboss.tools.vpe,
org.eclipse.core.resources,
- org.jboss.tools.jst.jsp
+ org.jboss.tools.jst.jsp,
+ org.mozilla.xpcom
Export-Package: org.jboss.tools.jsf.vpe.facelets
Bundle-Version: 2.0.0
Modified: branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeCompositionTemplate.java
===================================================================
--- branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeCompositionTemplate.java 2007-08-09 09:12:47 UTC (rev 3002)
+++ branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeCompositionTemplate.java 2007-08-09 09:23:59 UTC (rev 3003)
@@ -10,23 +10,25 @@
******************************************************************************/
package org.jboss.tools.jsf.vpe.facelets.template;
+import org.jboss.tools.vpe.editor.VpeVisualDomBuilder;
+import org.jboss.tools.vpe.editor.context.VpePageContext;
+import org.jboss.tools.vpe.editor.template.VpeCreationData;
+import org.jboss.tools.vpe.editor.util.HTML;
+import org.mozilla.interfaces.nsIDOMDocument;
+import org.mozilla.interfaces.nsIDOMElement;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-import org.jboss.tools.vpe.editor.VpeVisualDomBuilder;
-import org.jboss.tools.vpe.editor.context.VpePageContext;
-import org.jboss.tools.vpe.editor.template.VpeCreationData;
-
public class VpeCompositionTemplate extends VpeDefineContainerTemplate {
- protected VpeCreationData createStub(String fileName, Node sourceElement, Document visualDocument) {
- Element container = visualDocument.createElement("div");
+ protected VpeCreationData createStub(String fileName, Node sourceElement, nsIDOMDocument visualDocument) {
+ nsIDOMElement container = visualDocument.createElement(HTML.TAG_DIV);
container.setAttribute("style", "border: 1px dashed #2A7F00");
VpeVisualDomBuilder.markIncludeElement(container);
- Element title = visualDocument.createElement("div");
- Element tag = visualDocument.createElement("span");
+ nsIDOMElement title = visualDocument.createElement(HTML.TAG_DIV);
+ nsIDOMElement tag = visualDocument.createElement(HTML.TAG_SPAN);
tag.setAttribute("class", "__any__tag__caption");
tag.appendChild(visualDocument.createTextNode(sourceElement.getNodeName()));
title.appendChild(tag);
Modified: branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDecorateTemplate.java
===================================================================
--- branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDecorateTemplate.java 2007-08-09 09:12:47 UTC (rev 3002)
+++ branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDecorateTemplate.java 2007-08-09 09:23:59 UTC (rev 3003)
@@ -10,24 +10,24 @@
******************************************************************************/
package org.jboss.tools.jsf.vpe.facelets.template;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
import org.jboss.tools.vpe.editor.VpeVisualDomBuilder;
import org.jboss.tools.vpe.editor.template.VpeChildrenInfo;
import org.jboss.tools.vpe.editor.template.VpeCreationData;
+import org.jboss.tools.vpe.editor.util.HTML;
+import org.mozilla.interfaces.nsIDOMDocument;
+import org.mozilla.interfaces.nsIDOMElement;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
public class VpeDecorateTemplate extends VpeDefineContainerTemplate {
- protected VpeCreationData createStub(String fileName, Node sourceElement, Document visualDocument) {
- Element container = visualDocument.createElement("div");
+ protected VpeCreationData createStub(String fileName, Node sourceElement, nsIDOMDocument visualDocument) {
+ nsIDOMElement container = visualDocument.createElement(HTML.TAG_DIV);
container.setAttribute("style", "border: 1px dashed #2A7F00");
VpeVisualDomBuilder.markIncludeElement(container);
- Element title = visualDocument.createElement("div");
- Element tag = visualDocument.createElement("span");
+ nsIDOMElement title = visualDocument.createElement(HTML.TAG_DIV);
+ nsIDOMElement tag = visualDocument.createElement(HTML.TAG_SPAN);
tag.setAttribute("class", "__any__tag__caption");
tag.appendChild(visualDocument.createTextNode(sourceElement.getNodeName()));
title.appendChild(tag);
Modified: branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDefineContainerTemplate.java
===================================================================
--- branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDefineContainerTemplate.java 2007-08-09 09:12:47 UTC (rev 3002)
+++ branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDefineContainerTemplate.java 2007-08-09 09:23:59 UTC (rev 3003)
@@ -30,6 +30,9 @@
import org.jboss.tools.vpe.editor.template.VpeCreatorUtil;
import org.jboss.tools.vpe.editor.template.VpeTemplate;
import org.jboss.tools.vpe.editor.template.VpeTemplateManager;
+import org.jboss.tools.vpe.editor.util.HTML;
+import org.mozilla.interfaces.nsIDOMDocument;
+import org.mozilla.interfaces.nsIDOMElement;
public abstract class VpeDefineContainerTemplate extends VpeAbstractTemplate {
private static final String ATTR_TEMPLATE = "template";
@@ -42,7 +45,7 @@
}
- public VpeCreationData create(VpePageContext pageContext, Node sourceNode, Document visualDocument) {
+ public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) {
String fileName = null;
Attr attr = ((Element)sourceNode).getAttributeNode(ATTR_TEMPLATE);
if (attr != null && attr.getNodeValue().trim().length() > 0) {
@@ -106,8 +109,8 @@
}
}
- private VpeCreationData createInclude(Document sourceDocument, Document visualDocument) {
- Element visualNewElement = visualDocument.createElement("div");
+ private VpeCreationData createInclude(Document sourceDocument, nsIDOMDocument visualDocument) {
+ nsIDOMElement visualNewElement = visualDocument.createElement(HTML.TAG_DIV);
VpeVisualDomBuilder.markIncludeElement(visualNewElement);
VpeCreationData creationData = new VpeCreationData(visualNewElement);
VpeChildrenInfo childrenInfo = new VpeChildrenInfo(visualNewElement);
@@ -129,7 +132,7 @@
}
- protected abstract VpeCreationData createStub(String fileName, Node sourceElement, Document visualDocument);
+ protected abstract VpeCreationData createStub(String fileName, Node sourceElement, nsIDOMDocument visualDocument);
static class TemplateFileInfo {
IFile templateFile;
Modified: branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDefineTemplate.java
===================================================================
--- branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDefineTemplate.java 2007-08-09 09:12:47 UTC (rev 3002)
+++ branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDefineTemplate.java 2007-08-09 09:23:59 UTC (rev 3003)
@@ -10,16 +10,16 @@
******************************************************************************/
package org.jboss.tools.jsf.vpe.facelets.template;
+import org.jboss.tools.vpe.editor.context.VpePageContext;
+import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate;
+import org.jboss.tools.vpe.editor.template.VpeCreationData;
+import org.jboss.tools.vpe.editor.util.HTML;
+import org.mozilla.interfaces.nsIDOMDocument;
+import org.mozilla.interfaces.nsIDOMElement;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-import org.jboss.tools.vpe.editor.context.VpePageContext;
-import org.jboss.tools.vpe.editor.mapping.VpeElementMapping;
-import org.jboss.tools.vpe.editor.mapping.VpeNodeMapping;
-import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate;
-import org.jboss.tools.vpe.editor.template.VpeCreationData;
-
public class VpeDefineTemplate extends VpeAbstractTemplate {
protected void init(Element templateElement) {
@@ -28,9 +28,9 @@
initTemplateSections(templateElement, true, true, true, true, true);
}
- public VpeCreationData create(VpePageContext pageContext, Node sourceNode, Document visualDocument) {
+ public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) {
if (VpeDefineContainerTemplate.isDefineContainer(sourceNode.getParentNode())) {
- Element visualNewElement = visualDocument.createElement("div");
+ nsIDOMElement visualNewElement = visualDocument.createElement(HTML.TAG_DIV);
return new VpeCreationData(visualNewElement);
}
return createStub((Element)sourceNode, visualDocument);
@@ -44,12 +44,12 @@
return true;
}
- private VpeCreationData createStub(Element sourceElement, Document visualDocument) {
- Element container = visualDocument.createElement("div");
+ private VpeCreationData createStub(Element sourceElement, nsIDOMDocument visualDocument) {
+ nsIDOMElement container = visualDocument.createElement(HTML.TAG_DIV);
container.setAttribute("style", "border: 1px solid gray");
- Element title = visualDocument.createElement("div");
- Element tag = visualDocument.createElement("span");
+ nsIDOMElement title = visualDocument.createElement(HTML.TAG_DIV);
+ nsIDOMElement tag = visualDocument.createElement(HTML.TAG_SPAN);
tag.setAttribute("class", "__any__tag__caption");
tag.appendChild(visualDocument.createTextNode(sourceElement.getNodeName()));
title.appendChild(tag);
Modified: branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeInsertTemplate.java
===================================================================
--- branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeInsertTemplate.java 2007-08-09 09:12:47 UTC (rev 3002)
+++ branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeInsertTemplate.java 2007-08-09 09:23:59 UTC (rev 3003)
@@ -10,17 +10,19 @@
******************************************************************************/
package org.jboss.tools.jsf.vpe.facelets.template;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
import org.jboss.tools.vpe.editor.VpeIncludeInfo;
import org.jboss.tools.vpe.editor.VpeVisualDomBuilder;
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate;
import org.jboss.tools.vpe.editor.template.VpeChildrenInfo;
import org.jboss.tools.vpe.editor.template.VpeCreationData;
+import org.jboss.tools.vpe.editor.util.HTML;
+import org.mozilla.interfaces.nsIDOMDocument;
+import org.mozilla.interfaces.nsIDOMElement;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
public class VpeInsertTemplate extends VpeAbstractTemplate {
@@ -30,7 +32,7 @@
initTemplateSections(templateElement, false, true, false, false, false);
}
- public VpeCreationData create(VpePageContext pageContext, Node sourceNode, Document visualDocument) {
+ public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) {
VpeVisualDomBuilder visualBuilder = pageContext.getVisualBuilder();
VpeIncludeInfo includeInfo = visualBuilder.getCurrentIncludeInfo();
if (includeInfo != null && includeInfo.getElement() != null) {
@@ -79,7 +81,7 @@
return defineElement;
}
- private VpeCreationData createInsert(Element defineElement, Document visualDocument) {
+ private VpeCreationData createInsert(Element defineElement, nsIDOMDocument visualDocument) {
VpeCreationData creationData = new VpeCreationData(null);
VpeChildrenInfo childrenInfo = new VpeChildrenInfo(null);
childrenInfo.addSourceChild(defineElement);
@@ -87,8 +89,8 @@
return creationData;
}
- private VpeCreationData createStub(Element element, Document visualDocument) {
- Element visualNewElement = visualDocument.createElement("div");
+ private VpeCreationData createStub(Element element, nsIDOMDocument visualDocument) {
+ nsIDOMElement visualNewElement = visualDocument.createElement(HTML.TAG_DIV);
return new VpeCreationData(visualNewElement);
}
}
18 years, 4 months
JBoss Tools SVN: r3002 - trunk/common/plugins/org.jboss.tools.common.model/images/webxml.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-08-09 05:12:47 -0400 (Thu, 09 Aug 2007)
New Revision: 3002
Added:
trunk/common/plugins/org.jboss.tools.common.model/images/webxml/message.gif
trunk/common/plugins/org.jboss.tools.common.model/images/webxml/service.gif
Log:
JBIDE-686
Added: trunk/common/plugins/org.jboss.tools.common.model/images/webxml/message.gif
===================================================================
(Binary files differ)
Property changes on: trunk/common/plugins/org.jboss.tools.common.model/images/webxml/message.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/common/plugins/org.jboss.tools.common.model/images/webxml/service.gif
===================================================================
(Binary files differ)
Property changes on: trunk/common/plugins/org.jboss.tools.common.model/images/webxml/service.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
18 years, 4 months
JBoss Tools SVN: r3001 - trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-08-09 05:12:19 -0400 (Thu, 09 Aug 2007)
New Revision: 3001
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/webapp24.meta
Log:
JBIDE-686
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/webapp24.meta
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/webapp24.meta 2007-08-09 09:09:20 UTC (rev 3000)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/webapp24.meta 2007-08-09 09:12:19 UTC (rev 3001)
@@ -61,7 +61,7 @@
<ICON name="listener" path="images/webxml/listener.gif"/>
<ICON name="login_config" path="images/webxml/login.gif"/>
<ICON name="mapping" path="images/java/attr.gif"/>
- <ICON name="message" path="images/process/input_message.gif"/>
+ <ICON name="message" path="images/webxml/message.gif"/>
<ICON name="mime_mapping" path="images/webxml/mime_map.gif"/>
<ICON name="param" path="images/webxml/init_param.gif"/>
<ICON name="res_env_ref" path="images/webxml/reference.gif"/>
@@ -70,7 +70,7 @@
<ICON name="run_as" path="images/webxml/run_as.gif"/>
<ICON name="security_constraint" path="images/webxml/security_constraint.gif"/>
<ICON name="security_role" path="images/webxml/security_role.gif"/>
- <ICON name="service" path="images/process/service.gif"/>
+ <ICON name="service" path="images/webxml/service.gif"/>
<ICON name="servlet" path="images/webxml/servlet.gif"/>
<ICON name="servlet_mapping" path="images/webxml/servlet_map.gif"/>
<ICON name="session" path="images/webxml/session_config.gif"/>
18 years, 4 months