JBoss Tools SVN: r30491 - in trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core: src/org/jboss/tools/cdi/seam/solder/core and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2011-04-11 17:54:00 -0400 (Mon, 11 Apr 2011)
New Revision: 30491
Added:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderLoggerExtension.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/plugin.xml
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderConstants.java
Log:
JBIDE-8712
https://issues.jboss.org/browse/JBIDE-8712
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/plugin.xml
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/plugin.xml 2011-04-11 21:24:02 UTC (rev 30490)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/plugin.xml 2011-04-11 21:54:00 UTC (rev 30491)
@@ -7,5 +7,9 @@
class="org.jboss.tools.cdi.seam.solder.core.CDISeamSolderCoreExtension"
runtime="org.jboss.seam.solder.core.CoreExtension">
</cdiextension>
+ <cdiextension
+ class="org.jboss.tools.cdi.seam.solder.core.CDISeamSolderLoggerExtension"
+ runtime="org.jboss.seam.solder.logging.TypedMessageLoggerExtension">
+ </cdiextension>
</extension>
</plugin>
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderConstants.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderConstants.java 2011-04-11 21:24:02 UTC (rev 30490)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderConstants.java 2011-04-11 21:54:00 UTC (rev 30491)
@@ -8,4 +8,7 @@
public String REQUIRES_ANNOTATION_TYPE_NAME = "org.jboss.seam.solder.core.Requires";
public String VETO_ANNOTATION_TYPE_NAME = "org.jboss.seam.solder.core.Veto";
+ public String MESSAGE_LOGGER_ANNOTATION_TYPE_NAME = "org.jboss.seam.solder.logging.MessageLogger";
+ public String MESSAGE_BUNDLE_ANNOTATION_TYPE_NAME = "org.jboss.seam.solder.messages.MessageBundle";
+
}
Added: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderLoggerExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderLoggerExtension.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderLoggerExtension.java 2011-04-11 21:54:00 UTC (rev 30491)
@@ -0,0 +1,186 @@
+package org.jboss.tools.cdi.seam.solder.core;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.jdt.core.IPackageFragmentRoot;
+import org.eclipse.jdt.core.IType;
+import org.jboss.tools.cdi.core.CDICoreNature;
+import org.jboss.tools.cdi.core.IRootDefinitionContext;
+import org.jboss.tools.cdi.core.extension.ICDIExtension;
+import org.jboss.tools.cdi.core.extension.IDefinitionContextExtension;
+import org.jboss.tools.cdi.core.extension.feature.IBuildParticipantFeature;
+import org.jboss.tools.cdi.internal.core.impl.CDIProject;
+import org.jboss.tools.cdi.internal.core.impl.ClassBean;
+import org.jboss.tools.cdi.internal.core.impl.definition.AbstractMemberDefinition;
+import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition;
+import org.jboss.tools.cdi.internal.core.scanner.FileSet;
+import org.jboss.tools.common.model.XModelObject;
+
+public class CDISeamSolderLoggerExtension implements ICDIExtension, IBuildParticipantFeature {
+ CDICoreNature project;
+ LoggerDefinitionContext context = new LoggerDefinitionContext();
+
+ public Object getAdapter(Class adapter) {
+ return null;
+ }
+
+ public void setProject(CDICoreNature n) {
+ project = n;
+ }
+
+ public IDefinitionContextExtension getContext() {
+ return context;
+ }
+
+ public void beginVisiting() {
+ }
+
+ public void visitJar(IPath path, IPackageFragmentRoot root, XModelObject beansXML) {
+ }
+
+ public void visit(IFile file, IPath src, IPath webinf) {
+ }
+
+ public void buildDefinitions() {
+ }
+
+ public void buildDefinitions(FileSet fileSet) {
+ Map<IPath, Set<IType>> is = fileSet.getInterfaces();
+ for (IPath path: is.keySet()) {
+ Set<IType> ts = is.get(path);
+ for (IType t: ts) {
+ InterfaceDefinition i = new InterfaceDefinition(t);
+ if(i.isAnnotationPresent(CDISeamSolderConstants.MESSAGE_LOGGER_ANNOTATION_TYPE_NAME)) {
+ TypeDefinition d = new TypeDefinition();
+ d.setType(t, context.getRootContext());
+ ((LoggerDefinitionContext)context.getWorkingCopy()).addMessageLogger(path, d);
+ } else if(i.isAnnotationPresent(CDISeamSolderConstants.MESSAGE_BUNDLE_ANNOTATION_TYPE_NAME)) {
+ TypeDefinition d = new TypeDefinition();
+ d.setType(t, context.getRootContext());
+ ((LoggerDefinitionContext)context.getWorkingCopy()).addMessageBundle(path, d);
+ }
+ }
+ }
+ }
+
+ public void buildBeans() {
+ CDIProject p = ((CDIProject)project.getDelegate());
+ Map<IPath, TypeDefinition> loggers = context.getMessageLoggers();
+ for (TypeDefinition d: loggers.values()) {
+ ClassBean b = new ClassBean();
+ b.setDefinition(d);
+ b.setParent(p);
+ p.addBean(b);
+ }
+
+ Map<IPath, TypeDefinition> bundles = context.getMessageBundles();
+ for (TypeDefinition d: bundles.values()) {
+ ClassBean b = new ClassBean();
+ b.setDefinition(d);
+ b.setParent(p);
+ p.addBean(b);
+ }
+
+ }
+
+ class LoggerDefinitionContext implements IDefinitionContextExtension {
+ IRootDefinitionContext root;
+
+ Map<IPath, TypeDefinition> messageLoggers = new HashMap<IPath, TypeDefinition>();
+ Map<IPath, TypeDefinition> messageBundles = new HashMap<IPath, TypeDefinition>();
+
+ LoggerDefinitionContext original;
+ LoggerDefinitionContext workingCopy;
+
+ private LoggerDefinitionContext copy(boolean clean) {
+ LoggerDefinitionContext copy = new LoggerDefinitionContext();
+ copy.root = root;
+ if(!clean) {
+ copy.messageLoggers.putAll(messageLoggers);
+ copy.messageBundles.putAll(messageBundles);
+ }
+
+ return copy;
+ }
+
+ public void newWorkingCopy(boolean forFullBuild) {
+ if(original != null) return;
+ workingCopy = copy(forFullBuild);
+ workingCopy.original = this;
+ }
+
+ public void applyWorkingCopy() {
+ if(original != null) {
+ original.applyWorkingCopy();
+ return;
+ }
+ if(workingCopy == null) {
+ return;
+ }
+ messageLoggers = workingCopy.messageLoggers;
+ messageBundles = workingCopy.messageBundles;
+
+ workingCopy = null;
+ }
+
+ public void clean() {
+ messageLoggers.clear();
+ messageBundles.clear();
+ }
+
+ public void clean(IPath path) {
+ messageLoggers.remove(path);
+ messageBundles.remove(path);
+ }
+
+ public void setRootContext(IRootDefinitionContext context) {
+ root = context;
+ }
+
+ public IRootDefinitionContext getRootContext() {
+ return root;
+ }
+
+ public IDefinitionContextExtension getWorkingCopy() {
+ if(original != null) {
+ return this;
+ }
+ if(workingCopy != null) {
+ return workingCopy;
+ }
+ workingCopy = copy(false);
+ workingCopy.original = this;
+ return workingCopy;
+ }
+
+ public void addMessageLogger(IPath path, TypeDefinition def) {
+ messageLoggers.put(path, def);
+ root.addToParents(path);
+ }
+
+ public void addMessageBundle(IPath path, TypeDefinition def) {
+ messageBundles.put(path, def);
+ root.addToParents(path);
+ }
+
+ public Map<IPath, TypeDefinition> getMessageLoggers() {
+ return messageLoggers;
+ }
+
+ public Map<IPath, TypeDefinition> getMessageBundles() {
+ return messageBundles;
+ }
+
+ }
+
+ class InterfaceDefinition extends AbstractMemberDefinition {
+ InterfaceDefinition(IType type) {
+ setAnnotatable(type, type, context.getRootContext());
+ }
+ }
+
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderLoggerExtension.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
13 years, 6 months
JBoss Tools SVN: r30490 - trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/util.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-04-11 17:24:02 -0400 (Mon, 11 Apr 2011)
New Revision: 30490
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/util/VCFUtil.java
Log:
adding bpel facet support for future transition
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/util/VCFUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/util/VCFUtil.java 2011-04-11 20:45:21 UTC (rev 30489)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/util/VCFUtil.java 2011-04-11 21:24:02 UTC (rev 30490)
@@ -108,6 +108,7 @@
if( facet.getId().equals(IModuleConstants.JST_CONNECTOR_MODULE)) return ".rar";
if( facet.getId().equals("jst.jboss.esb")) return ".esb";
if( facet.getId().equals("jbt.bpel.facet.core")) return ".bpel";
+ if( facet.getId().equals("bpel.facet.core")) return ".bpel";
// TODO add our extensions
}
return null;
13 years, 6 months
JBoss Tools SVN: r30489 - workspace/Denny/esb-example-soa-p5.0.
by jbosstools-commits@lists.jboss.org
Author: bfitzpat
Date: 2011-04-11 16:45:21 -0400 (Mon, 11 Apr 2011)
New Revision: 30489
Modified:
workspace/Denny/esb-example-soa-p5.0/helloworld_file_action.zip
Log:
JBDS-8053 - updated esb file action example with new readme documenting how to use/test it
Modified: workspace/Denny/esb-example-soa-p5.0/helloworld_file_action.zip
===================================================================
(Binary files differ)
13 years, 6 months
JBoss Tools SVN: r30488 - workspace/Denny/esb-example-soa-p5.0.
by jbosstools-commits@lists.jboss.org
Author: bfitzpat
Date: 2011-04-11 16:44:23 -0400 (Mon, 11 Apr 2011)
New Revision: 30488
Modified:
workspace/Denny/esb-example-soa-p5.0/helloworld_file_action_all.zip
Log:
JBDS-8053 - updated esb file action example with new readme documenting how to use/test it
Modified: workspace/Denny/esb-example-soa-p5.0/helloworld_file_action_all.zip
===================================================================
(Binary files differ)
13 years, 6 months
JBoss Tools SVN: r30487 - in branches/jbosstools-3.2.x/build: parent and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-04-11 15:18:55 -0400 (Mon, 11 Apr 2011)
New Revision: 30487
Modified:
branches/jbosstools-3.2.x/build/build.xml
branches/jbosstools-3.2.x/build/parent/pom.xml
Log:
move from 4.1.0.CR1 to 4.1.0.M1 to adhere to PM rules
Modified: branches/jbosstools-3.2.x/build/build.xml
===================================================================
--- branches/jbosstools-3.2.x/build/build.xml 2011-04-11 18:54:34 UTC (rev 30486)
+++ branches/jbosstools-3.2.x/build/build.xml 2011-04-11 19:18:55 UTC (rev 30487)
@@ -18,7 +18,7 @@
/>
<!-- svn root, including trunk or branch path -->
- <property name="svn.root" value="http://anonsvn.jboss.org/repos/jbosstools/branches/jbosstools-3.2.0.CR1" />
+ <property name="svn.root" value="http://anonsvn.jboss.org/repos/jbosstools/branches/jbosstools-3.2.x" />
<!-- if true, use -Dmaven.repo.local=${COMMON_TOOLS}/m2-repository; if false, use default ~/.m2/repository; or set another path if preferred -->
<property name="maven.repo.local" value="true" />
@@ -26,7 +26,7 @@
<!-- name/version we're building -->
<property name="product.name" value="JBoss Tools" />
<property name="product.id" value="JBossTools" />
- <property name="product.version" value="3.2.0-beta-1" />
+ <property name="product.version" value="3.2.1" />
<!--
<property name="product.name" value="JBoss Developer Studio"/>
<property name="product.id" value="JBDS"/>
Modified: branches/jbosstools-3.2.x/build/parent/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/build/parent/pom.xml 2011-04-11 18:54:34 UTC (rev 30486)
+++ branches/jbosstools-3.2.x/build/parent/pom.xml 2011-04-11 19:18:55 UTC (rev 30487)
@@ -15,7 +15,7 @@
<!--tychoVersion>0.10.0-SNAPSHOT</tychoVersion -->
<tychoVersion>0.10.0</tychoVersion>
<scmBranch>branches/jbosstools-3.2.x</scmBranch>
- <BUILD_ALIAS>GA</BUILD_ALIAS>
+ <BUILD_ALIAS>M1</BUILD_ALIAS>
<memoryOptions1>-Xms512m -Xmx1024m -XX:PermSize=256m</memoryOptions1>
<memoryOptions2>-XX:MaxPermSize=256m</memoryOptions2>
<systemProperties></systemProperties>
13 years, 6 months
JBoss Tools SVN: r30486 - in trunk/download.jboss.org/jbosstools/updates: indigo and 2 other directories.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-04-11 14:54:34 -0400 (Mon, 11 Apr 2011)
New Revision: 30486
Modified:
trunk/download.jboss.org/jbosstools/updates/helios/README.txt
trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml
trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml
trunk/download.jboss.org/jbosstools/updates/indigo/README.txt
trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml
trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml
trunk/download.jboss.org/jbosstools/updates/requirements/index.html
trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml
Log:
add new 3rd party reqs to helios and indigo composite sites per JBDS-1593 and JBDS-1594
Modified: trunk/download.jboss.org/jbosstools/updates/helios/README.txt
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/helios/README.txt 2011-04-11 17:53:17 UTC (rev 30485)
+++ trunk/download.jboss.org/jbosstools/updates/helios/README.txt 2011-04-11 18:54:34 UTC (rev 30486)
@@ -1,20 +1,4 @@
-Instead of mirroring Helios here, composite a site here from:
+Instead of mirroring Helios here, composite a site.
+See composite*.xml for contained site refs.
-<children size='14'>
-<child location='../requirements/helios/SR2/'/>
-<child location='../requirements/birt/2.6.2/'/>
-<child location='../requirements/ecf/3.4/'/>
-<child location='../requirements/eclipse/3.6/'/>
-<child location='../requirements/emf/2.6/'/>
-<child location='../requirements/gwt/201012211742/'/>
-<child location='../requirements/m2eclipse/0.12/'/>
-<child location='../requirements/orbit/S20110124210048/'/>
-<child location='../requirements/subclipse/1.6/'/>
-<child location='../requirements/subversive/0.7.9_2.2.2/'/>
-<child location='../requirements/swtbot/2.0.3/'/>
-<child location='../requirements/tptp/4.7/'/>
-<child location='../requirements/webtools/3.2.3/'/>
-<child location='../requirements/xulrunner-1.9.1.2/'/>
-</children>
-
-See /updates/requirements/{*}/build.xml for how to mirror these sites.
+See /updates/requirements/{*}/build.xml for how to mirror other sites.
Modified: trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml 2011-04-11 17:53:17 UTC (rev 30485)
+++ trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml 2011-04-11 18:54:34 UTC (rev 30486)
@@ -7,20 +7,27 @@
get new time w/
date +%s000
-->
-<property name='p2.timestamp' value='1299784094000'/>
+<property name='p2.timestamp' value='1302291248000'/>
</properties>
-<children size='14'>
+<children size='18'>
<child location='../requirements/helios/SR2/'/>
<child location='../requirements/birt/2.6.2/'/>
<child location='../requirements/ecf/3.4/'/>
<child location='../requirements/eclipse/3.6/'/>
+<child location='../requirements/egit/0.11/'/>
+
<child location='../requirements/emf/2.6/'/>
+<child location='../requirements/findbugs/1.3.9/'/>
<child location='../requirements/gwt/201012211742/'/>
+<child location='../requirements/mylyn/3.6/'/>
<child location='../requirements/m2eclipse/0.12/'/>
+
<child location='../requirements/orbit/S20110124210048/'/>
+<child location='../requirements/pmd/3.2.6/'/>
<child location='../requirements/subclipse/1.6/'/>
<child location='../requirements/subversive/0.7.9_2.2.2/'/>
<child location='../requirements/swtbot/2.0.3/'/>
+
<child location='../requirements/tptp/4.7/'/>
<child location='../requirements/webtools/3.2.3/'/>
<child location='../requirements/xulrunner-1.9.1.2/'/>
Modified: trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml 2011-04-11 17:53:17 UTC (rev 30485)
+++ trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml 2011-04-11 18:54:34 UTC (rev 30486)
@@ -7,20 +7,27 @@
get new time w/
date +%s000
-->
-<property name='p2.timestamp' value='1299784094000'/>
+<property name='p2.timestamp' value='1302291248000'/>
</properties>
-<children size='14'>
+<children size='18'>
<child location='../requirements/helios/SR2/'/>
<child location='../requirements/birt/2.6.2/'/>
<child location='../requirements/ecf/3.4/'/>
<child location='../requirements/eclipse/3.6/'/>
+<child location='../requirements/egit/0.11/'/>
+
<child location='../requirements/emf/2.6/'/>
+<child location='../requirements/findbugs/1.3.9/'/>
<child location='../requirements/gwt/201012211742/'/>
+<child location='../requirements/mylyn/3.6/'/>
<child location='../requirements/m2eclipse/0.12/'/>
+
<child location='../requirements/orbit/S20110124210048/'/>
+<child location='../requirements/pmd/3.2.6/'/>
<child location='../requirements/subclipse/1.6/'/>
<child location='../requirements/subversive/0.7.9_2.2.2/'/>
<child location='../requirements/swtbot/2.0.3/'/>
+
<child location='../requirements/tptp/4.7/'/>
<child location='../requirements/webtools/3.2.3/'/>
<child location='../requirements/xulrunner-1.9.1.2/'/>
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/README.txt
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/README.txt 2011-04-11 17:53:17 UTC (rev 30485)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/README.txt 2011-04-11 18:54:34 UTC (rev 30486)
@@ -1,4 +1,4 @@
-Instead of mirroring Helios here, composite a site.
+Instead of mirroring Indigo here, composite a site.
See composite*.xml for contained site refs.
See /updates/requirements/{*}/build.xml for how to mirror other sites.
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml 2011-04-11 17:53:17 UTC (rev 30485)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml 2011-04-11 18:54:34 UTC (rev 30486)
@@ -7,9 +7,9 @@
get new time w/
date +%s000
-->
-<property name='p2.timestamp' value='1302020814000'/>
+<property name='p2.timestamp' value='1302291248000'/>
</properties>
-<children size='13'>
+<children size='18'>
<child location='../requirements/indigo/201103180900-M6/'/>
<child location='../requirements/birt/4.0M6/'/>
<child location='../requirements/eclipse/3.7M6/'/>
@@ -17,9 +17,15 @@
<child location='../requirements/webtools/3.3M6/'/>
<child location='../requirements/ecf/3.5/'/>
+<child location='../requirements/egit/0.11/'/>
+<child location='../requirements/findbugs/1.3.9/'/>
<child location='../requirements/gwt/201102111811/'/>
+<child location='../requirements/jslint/1.5/'/>
+
+<child location='../requirements/mylyn/3.6/'/>
<child location='../requirements/m2eclipse/0.13.0.201103291237/'/>
<child location='../requirements/orbit/S20110124210048/'/>
+<child location='../requirements/pmd/3.2.6/'/>
<child location='../requirements/subclipse/1.6/'/>
<child location='../requirements/subversive/0.7.9_2.2.2/'/>
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml 2011-04-11 17:53:17 UTC (rev 30485)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml 2011-04-11 18:54:34 UTC (rev 30486)
@@ -7,9 +7,9 @@
get new time w/
date +%s000
-->
-<property name='p2.timestamp' value='1302020814000'/>
+<property name='p2.timestamp' value='1302291248000'/>
</properties>
-<children size='13'>
+<children size='18'>
<child location='../requirements/indigo/201103180900-M6/'/>
<child location='../requirements/birt/4.0M6/'/>
<child location='../requirements/eclipse/3.7M6/'/>
@@ -17,9 +17,15 @@
<child location='../requirements/webtools/3.3M6/'/>
<child location='../requirements/ecf/3.5/'/>
+<child location='../requirements/egit/0.11/'/>
+<child location='../requirements/findbugs/1.3.9/'/>
<child location='../requirements/gwt/201102111811/'/>
+<child location='../requirements/jslint/1.5/'/>
+
+<child location='../requirements/mylyn/3.6/'/>
<child location='../requirements/m2eclipse/0.13.0.201103291237/'/>
<child location='../requirements/orbit/S20110124210048/'/>
+<child location='../requirements/pmd/3.2.6/'/>
<child location='../requirements/subclipse/1.6/'/>
<child location='../requirements/subversive/0.7.9_2.2.2/'/>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/index.html
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/index.html 2011-04-11 17:53:17 UTC (rev 30485)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/index.html 2011-04-11 18:54:34 UTC (rev 30486)
@@ -52,9 +52,13 @@
<li><a class=link href=ecf>ecf</a></li>
<li><a class=link href=eclipse>eclipse</a></li>
<li><a class=link href=emf>emf</a></li>
+<li><a class=link href=findbugs>findbugs</a></li>
<li><a class=link href=gwt/201102111811>gwt/201102111811</a></li>
-<li><a class=link href=m2eclipse>m2eclipse</a></li>
+<li><a class=link href=jslint>jslint</a></li>
+<li><a class=link href=mylyn>mylyn</a> (including connectors for: Eclipse/PDE/Java, JIRA, Bugzilla, CVS, SVN, Git)</li>
+<li><a class=link href=m2eclipse>m2eclipse/0.13</a></li>
<li><a class=link href=orbit/S20110124210048>orbit/S20110124210048</a></li>
+<li><a class=link href=pmd>pmd</a></li>
<li><a class=link href=subclipse>subclipse</a></li>
<li><a class=link href=subversive>subversive</a></li>
<li><a class=link href=swtbot/2.0.3>swtbot/2.0.3</a></li>
@@ -67,10 +71,14 @@
<li><a class=link href=birt/2.6.2>birt/2.6.2</a></li>
<li><a class=link href=ecf>ecf/3.4</a></li>
<li><a class=link href=eclipse>eclipse/3.6</a></li>
+<li><a class=link href=egit>egit</a></li>
<li><a class=link href=emf>emf/2.6</a></li>
+<li><a class=link href=findbugs>findbugs</a></li>
<li><a class=link href=gwt/201012211742>gwt/201012211742</a></li>
+<li><a class=link href=mylyn>mylyn</a> (including connectors for: Eclipse/PDE/Java, JIRA, Bugzilla, CVS, SVN, Git)</li>
+<li><a class=link href=m2eclipse/0.12>m2eclipse/0.12</a></li>
<li><a class=link href=orbit/R20100519200754>orbit/R20100519200754</a></li>
-<li><a class=link href=m2eclipse/0.12>m2eclipse/0.12</a></li>
+<li><a class=link href=pmd>pmd</a></li>
<li><a class=link href=thirdparty>thirdparty</a> (deprecated)</li>
<li><a class=link href=subclipse/1.6>subclipse/1.6</a></li>
<li><a class=link href=subversive/0.7.9_2.2.2>subversive/0.7.9_2.2.2</a></li>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml 2011-04-11 17:53:17 UTC (rev 30485)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml 2011-04-11 18:54:34 UTC (rev 30486)
@@ -50,7 +50,7 @@
<iu id="com.atlassian.connector.eclipse.feature.group" />
<iu id="com.atlassian.connector.eclipse.cvs.feature.group" />
<iu id="com.atlassian.connector.eclipse.jira.feature.group" />
- <!-- these last two are described as "obsolete" on the update site -->
+ <!-- these last two are described as "obsolete" on the update site -->
<iu id="com.atlassian.connector.eclipse.subclipse.feature.group" />
<iu id="com.atlassian.connector.eclipse.subversive.feature.group" />
</p2.mirror>
13 years, 6 months
JBoss Tools SVN: r30485 - in trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test: editor/tags and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2011-04-11 13:53:17 -0400 (Mon, 11 Apr 2011)
New Revision: 30485
Added:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/AjaxInvisibleTagsTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/CommandLinkTagTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/HtmlCommandLinkTagTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/IncludeTagTest.java
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java
Log:
Added Ajax Tags Tests
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java 2011-04-11 17:42:16 UTC (rev 30484)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java 2011-04-11 17:53:17 UTC (rev 30485)
@@ -34,6 +34,7 @@
import org.jboss.tools.vpe.ui.bot.test.editor.preferences.ShowSelectionTagBarTest;
import org.jboss.tools.vpe.ui.bot.test.editor.selectionbar.SelectionBarTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.ActionParamTagTest;
+import org.jboss.tools.vpe.ui.bot.test.editor.tags.AjaxInvisibleTagsTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.AjaxValidatorTagTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.BeanValidatorTagTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.CalendarTagTest;
@@ -42,6 +43,7 @@
import org.jboss.tools.vpe.ui.bot.test.editor.tags.ColumnsTagTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.ComboBoxTagTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.CommandButtonTagTest;
+import org.jboss.tools.vpe.ui.bot.test.editor.tags.CommandLinkTagTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.CoreHTMLTagsTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.DataDefinitionTagTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.DataGridTagTest;
@@ -52,6 +54,8 @@
import org.jboss.tools.vpe.ui.bot.test.editor.tags.EditorTagTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.ExtendedDataTableTagTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.FileUploadTagTest;
+import org.jboss.tools.vpe.ui.bot.test.editor.tags.HtmlCommandLinkTagTest;
+import org.jboss.tools.vpe.ui.bot.test.editor.tags.IncludeTagTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.InplaceInputTagTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.InplaceSelectInputTagTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.JSFTagsTest;
@@ -159,6 +163,10 @@
suite.addTestSuite(ToolbarAndToolbarGroupTagTest.class);
suite.addTestSuite(TogglePanelAndToogleControlTagTest.class);
suite.addTestSuite(CommandButtonTagTest.class);
+ suite.addTestSuite(CommandLinkTagTest.class);
+ suite.addTestSuite(HtmlCommandLinkTagTest.class);
+ suite.addTestSuite(IncludeTagTest.class);
+ suite.addTestSuite(AjaxInvisibleTagsTest.class);
suite.addTestSuite(XhtmlFilePerformanceTest.class);
return new TestSetup(suite);
}
Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/AjaxInvisibleTagsTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/AjaxInvisibleTagsTest.java (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/AjaxInvisibleTagsTest.java 2011-04-11 17:53:17 UTC (rev 30485)
@@ -0,0 +1,85 @@
+/*******************************************************************************
+
+ * Copyright (c) 2007-2011 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 org.jboss.tools.vpe.ui.bot.test.editor.tags;
+
+/**
+ * Tests ajax invisible tags behavior
+ * @author vlado pakan
+ *
+ */
+public class AjaxInvisibleTagsTest extends AbstractTagTest{
+ private static final String QUEUE_VALUE = "*! Queue Value";
+ private static final String JS_FUNCTION_VALUE = "*! JsFunction Value";
+ private static final String KEEP_ALIVE_VALUE = "*! KeepAlive Value";
+ private static final String SUPPORT_VALUE = "*! Support Value";
+ private static final String STATUS_VALUE = "*! Status Value";
+ @Override
+ protected void initPageContent() {
+ jspEditor.setText("<%@ taglib uri=\"http://java.sun.com/jsf/html\" prefix=\"h\" %>\n" +
+ "<%@ taglib uri=\"http://java.sun.com/jsf/core\" prefix=\"f\" %>\n" +
+ "<%@ taglib uri=\"http://richfaces.org/a4j\" prefix=\"a4j\" %>\n" +
+ "<%@ taglib uri=\"http://richfaces.org/rich\" prefix=\"rich\" %>\n" +
+ "<html>\n" +
+ " <head>\n" +
+ " </head>\n" +
+ " <body>\n" +
+ " <f:view>\n" +
+ " <a4j:jsFunction>" + AjaxInvisibleTagsTest.JS_FUNCTION_VALUE + "</a4j:jsFunction>\n" +
+ " <a4j:queue>" + AjaxInvisibleTagsTest.QUEUE_VALUE + "</a4j:queue>\n" +
+ " <a4j:keepAlive beanName=\"\">" + AjaxInvisibleTagsTest.KEEP_ALIVE_VALUE + "</a4j:keepAlive>\n" +
+ " <a4j:support>" + AjaxInvisibleTagsTest.SUPPORT_VALUE + "</a4j:support>\n" +
+ " <a4j:status>" + AjaxInvisibleTagsTest.STATUS_VALUE + "</a4j:status>\n" +
+ " </f:view>\n" +
+ " </body> \n" +
+ "</html>");
+ }
+
+ @Override
+ protected void verifyTag() {
+ // check Problems View for Errors
+ assertProbelmsViewNoErrors(botExt);
+ // check values which should not be displayed in Visual Editor
+ assertVisualEditorNotContainNodeWithValue(jspWebBrowser,
+ AjaxInvisibleTagsTest.JS_FUNCTION_VALUE,
+ AbstractTagTest.TEST_PAGE_NAME_JSP);
+ assertVisualEditorNotContainNodeWithValue(jspWebBrowser,
+ AjaxInvisibleTagsTest.QUEUE_VALUE,
+ AbstractTagTest.TEST_PAGE_NAME_JSP);
+ assertVisualEditorNotContainNodeWithValue(jspWebBrowser,
+ AjaxInvisibleTagsTest.KEEP_ALIVE_VALUE,
+ AbstractTagTest.TEST_PAGE_NAME_JSP);
+ assertVisualEditorNotContainNodeWithValue(jspWebBrowser,
+ AjaxInvisibleTagsTest.SUPPORT_VALUE,
+ AbstractTagTest.TEST_PAGE_NAME_JSP);
+ assertVisualEditorNotContainNodeWithValue(jspWebBrowser,
+ AjaxInvisibleTagsTest.STATUS_VALUE,
+ AbstractTagTest.TEST_PAGE_NAME_JSP);
+ // check empty Visual Editor
+ assertVisualEditorContainsManyNodes(jspWebBrowser,
+ "TABLE",
+ 1,
+ AbstractTagTest.TEST_PAGE_NAME_JSP);
+ assertVisualEditorContainsManyNodes(jspWebBrowser,
+ "TR",
+ 1,
+ AbstractTagTest.TEST_PAGE_NAME_JSP);
+ assertVisualEditorContainsManyNodes(jspWebBrowser,
+ "TD",
+ 1,
+ AbstractTagTest.TEST_PAGE_NAME_JSP);
+ assertVisualEditorContainsManyNodes(jspWebBrowser,
+ "DIV",
+ 4,
+ AbstractTagTest.TEST_PAGE_NAME_JSP);
+ }
+
+}
Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/AjaxInvisibleTagsTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/CommandLinkTagTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/CommandLinkTagTest.java (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/CommandLinkTagTest.java 2011-04-11 17:53:17 UTC (rev 30485)
@@ -0,0 +1,81 @@
+/*******************************************************************************
+
+ * Copyright (c) 2007-2011 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 org.jboss.tools.vpe.ui.bot.test.editor.tags;
+
+import org.jboss.tools.ui.bot.ext.Timing;
+
+/**
+ * Tests ajax command link Tag behavior
+ * @author vlado pakan
+ *
+ */
+public class CommandLinkTagTest extends AbstractTagTest{
+ private static final String LINK_VALUE = "*! Link Value";
+ @Override
+ protected void initPageContent() {
+ jspEditor.setText("<%@ taglib uri=\"http://java.sun.com/jsf/html\" prefix=\"h\" %>\n" +
+ "<%@ taglib uri=\"http://java.sun.com/jsf/core\" prefix=\"f\" %>\n" +
+ "<%@ taglib uri=\"http://richfaces.org/a4j\" prefix=\"a4j\" %>\n" +
+ "<%@ taglib uri=\"http://richfaces.org/rich\" prefix=\"rich\" %>\n" +
+ "<html>\n" +
+ " <head>\n" +
+ " </head>\n" +
+ " <body>\n" +
+ " <f:view>\n" +
+ " <a4j:commandLink>\n" +
+ " " + CommandLinkTagTest.LINK_VALUE + "\n" +
+ " <a4j:commandButton type=\"Submit\">\n" +
+ " </a4j:commandButton>\n" +
+ " </a4j:commandLink>\n" +
+ " </f:view>\n" +
+ " </body> \n" +
+ "</html>");
+ }
+
+ @Override
+ protected void verifyTag() {
+ assertVisualEditorContains(jspWebBrowser,
+ "INPUT",
+ new String[]{"type"},
+ new String[]{"Submit"},
+ AbstractTagTest.TEST_PAGE_NAME_JSP);
+ assertVisualEditorContains(jspWebBrowser,
+ "A",
+ null,
+ null,
+ AbstractTagTest.TEST_PAGE_NAME_JSP);
+ assertVisualEditorContainsNodeWithValue(jspWebBrowser,
+ CommandLinkTagTest.LINK_VALUE,
+ AbstractTagTest.TEST_PAGE_NAME_JSP);
+ // check tag selection
+ jspWebBrowser.selectDomNode(jspWebBrowser.getDomNodeByTagName("A",0), 0);
+ bot.sleep(Timing.time3S());
+ String selectedText = jspEditor.getSelection();
+ String hasToStartWith = "<a4j:commandLink";
+ assertTrue("Selected text in Source Pane has to start with '" + hasToStartWith + "'" +
+ "\nbut it is '" + selectedText + "'",
+ selectedText.trim().startsWith(hasToStartWith));
+ String hasEndWith = "</a4j:commandLink>";
+ assertTrue("Selected text in Source Pane has to end with '" + hasEndWith + "'" +
+ "\nbut it is '" + selectedText + "'",
+ selectedText.trim().endsWith(hasEndWith));
+ String hasToContain = "<a4j:commandButton type=\"Submit\">";
+ assertTrue("Selected text in Source Pane has to contain '" + hasToContain + "'" +
+ "\nbut it is '" + selectedText + "'",
+ selectedText.trim().contains(hasToContain));
+ hasToContain = CommandLinkTagTest.LINK_VALUE;
+ assertTrue("Selected text in Source Pane has to contain '" + hasToContain + "'" +
+ "\nbut it is '" + selectedText + "'",
+ selectedText.trim().contains(hasToContain));
+ }
+
+}
Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/CommandLinkTagTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/HtmlCommandLinkTagTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/HtmlCommandLinkTagTest.java (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/HtmlCommandLinkTagTest.java 2011-04-11 17:53:17 UTC (rev 30485)
@@ -0,0 +1,81 @@
+/*******************************************************************************
+
+ * Copyright (c) 2007-2011 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 org.jboss.tools.vpe.ui.bot.test.editor.tags;
+
+import org.jboss.tools.ui.bot.ext.Timing;
+
+/**
+ * Tests ajax Html Command Link Tag behavior
+ * @author vlado pakan
+ *
+ */
+public class HtmlCommandLinkTagTest extends AbstractTagTest{
+ private static final String LINK_VALUE = "*! Html Link Value";
+ @Override
+ protected void initPageContent() {
+ jspEditor.setText("<%@ taglib uri=\"http://java.sun.com/jsf/html\" prefix=\"h\" %>\n" +
+ "<%@ taglib uri=\"http://java.sun.com/jsf/core\" prefix=\"f\" %>\n" +
+ "<%@ taglib uri=\"http://richfaces.org/a4j\" prefix=\"a4j\" %>\n" +
+ "<%@ taglib uri=\"http://richfaces.org/rich\" prefix=\"rich\" %>\n" +
+ "<html>\n" +
+ " <head>\n" +
+ " </head>\n" +
+ " <body>\n" +
+ " <f:view>\n" +
+ " <a4j:htmlCommandLink>\n" +
+ " " + HtmlCommandLinkTagTest.LINK_VALUE + "\n" +
+ " <a4j:commandButton type=\"Submit\">\n" +
+ " </a4j:commandButton>\n" +
+ " </a4j:htmlCommandLink>\n" +
+ " </f:view>\n" +
+ " </body> \n" +
+ "</html>");
+ }
+
+ @Override
+ protected void verifyTag() {
+ assertVisualEditorContains(jspWebBrowser,
+ "INPUT",
+ new String[]{"type"},
+ new String[]{"Submit"},
+ AbstractTagTest.TEST_PAGE_NAME_JSP);
+ assertVisualEditorContains(jspWebBrowser,
+ "A",
+ null,
+ null,
+ AbstractTagTest.TEST_PAGE_NAME_JSP);
+ assertVisualEditorContainsNodeWithValue(jspWebBrowser,
+ HtmlCommandLinkTagTest.LINK_VALUE,
+ AbstractTagTest.TEST_PAGE_NAME_JSP);
+ // check tag selection
+ jspWebBrowser.selectDomNode(jspWebBrowser.getDomNodeByTagName("A",0), 0);
+ bot.sleep(Timing.time3S());
+ String selectedText = jspEditor.getSelection();
+ String hasToStartWith = "<a4j:htmlCommandLink";
+ assertTrue("Selected text in Source Pane has to start with '" + hasToStartWith + "'" +
+ "\nbut it is '" + selectedText + "'",
+ selectedText.trim().startsWith(hasToStartWith));
+ String hasEndWith = "</a4j:htmlCommandLink>";
+ assertTrue("Selected text in Source Pane has to end with '" + hasEndWith + "'" +
+ "\nbut it is '" + selectedText + "'",
+ selectedText.trim().endsWith(hasEndWith));
+ String hasToContain = "<a4j:commandButton type=\"Submit\">";
+ assertTrue("Selected text in Source Pane has to contain '" + hasToContain + "'" +
+ "\nbut it is '" + selectedText + "'",
+ selectedText.trim().contains(hasToContain));
+ hasToContain = HtmlCommandLinkTagTest.LINK_VALUE;
+ assertTrue("Selected text in Source Pane has to contain '" + hasToContain + "'" +
+ "\nbut it is '" + selectedText + "'",
+ selectedText.trim().contains(hasToContain));
+ }
+
+}
Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/HtmlCommandLinkTagTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/IncludeTagTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/IncludeTagTest.java (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/IncludeTagTest.java 2011-04-11 17:53:17 UTC (rev 30485)
@@ -0,0 +1,70 @@
+/*******************************************************************************
+
+ * Copyright (c) 2007-2011 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 org.jboss.tools.vpe.ui.bot.test.editor.tags;
+
+import org.jboss.tools.ui.bot.ext.Timing;
+import org.jboss.tools.ui.bot.ext.parts.SWTBotEditorExt;
+/**
+ * Tests ajax include Tag behavior
+ * @author vlado pakan
+ *
+ */
+public class IncludeTagTest extends AbstractTagTest{
+ private static final String INCLUDE_PAGE_NAME = "IncludePage.jsp";
+ @Override
+ protected void initPageContent() {
+ // Create pge which will be included
+ createJspPage(IncludeTagTest.INCLUDE_PAGE_NAME);
+ SWTBotEditorExt includeEditor = botExt.swtBotEditorExtByTitle(IncludeTagTest.INCLUDE_PAGE_NAME);
+ includeEditor.setText("<%@ taglib uri=\"http://richfaces.org/a4j\" prefix=\"a4j\" %>\n" +
+ "<a4j:commandButton type=\"Submit\">\n" +
+ "</a4j:commandButton>\n");
+ includeEditor.saveAndClose();
+
+ jspEditor.setText("<%@ taglib uri=\"http://java.sun.com/jsf/html\" prefix=\"h\" %>\n" +
+ "<%@ taglib uri=\"http://java.sun.com/jsf/core\" prefix=\"f\" %>\n" +
+ "<%@ taglib uri=\"http://richfaces.org/a4j\" prefix=\"a4j\" %>\n" +
+ "<%@ taglib uri=\"http://richfaces.org/rich\" prefix=\"rich\" %>\n" +
+ "<html>\n" +
+ " <head>\n" +
+ " </head>\n" +
+ " <body>\n" +
+ " <f:view>\n" +
+ " <a4j:include viewId=\"" + IncludeTagTest.INCLUDE_PAGE_NAME + "\"/>\n" +
+ " </f:view>\n" +
+ " </body> \n" +
+ "</html>");
+ }
+
+ @Override
+ protected void verifyTag() {
+ assertVisualEditorContains(jspWebBrowser,
+ "INPUT",
+ new String[]{"type"},
+ new String[]{"Submit"},
+ AbstractTagTest.TEST_PAGE_NAME_JSP);
+ assertVisualEditorContains(jspWebBrowser,
+ "DIV",
+ new String[] {"vpe:include-element"},
+ new String[] {"yes"},
+ AbstractTagTest.TEST_PAGE_NAME_JSP);
+ // check tag selection
+ jspWebBrowser.selectDomNode(jspWebBrowser.getDomNodeByTagName("INPUT",0), 0);
+ bot.sleep(Timing.time3S());
+ String selectedText = jspEditor.getSelection();
+ String hasToStartWith = "<a4j:include";
+ assertTrue("Selected text in Source Pane has to start with '" + hasToStartWith + "'" +
+ "\nbut it is '" + selectedText + "'",
+ selectedText.trim().startsWith(hasToStartWith));
+ }
+
+}
Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/IncludeTagTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
13 years, 6 months
JBoss Tools SVN: r30484 - workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-04-11 13:42:16 -0400 (Mon, 11 Apr 2011)
New Revision: 30484
Modified:
workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentBuilderIntegrationTest.java
Log:
[JBIDE-8690] added test that checks if app was deployed
Modified: workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentBuilderIntegrationTest.java
===================================================================
--- workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentBuilderIntegrationTest.java 2011-04-11 17:37:33 UTC (rev 30483)
+++ workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentBuilderIntegrationTest.java 2011-04-11 17:42:16 UTC (rev 30484)
@@ -48,11 +48,10 @@
private static final String BUNDLE_ID = "org.jboss.ide.eclipse.as7.deployment.tests";
private static final int WEBAPP_RESPONSE_TIMEOUT = 10 * 1024;
-
private static final String HOST = "localhost";
private static final int MGMT_PORT = 9999;
private static final int WEB_PORT = 8080;
-
+
@Before
public void setUp() throws UnknownHostException, IOException {
assertAs7IsRunning();
@@ -64,7 +63,8 @@
socket.connect(new InetSocketAddress(HOST, MGMT_PORT));
socket.close();
} catch (ConnectException e) {
- fail("JBoss as7 seems not to run on " + HOST + ", test cannot access it's management API on port " + MGMT_PORT);
+ fail("JBoss as7 seems not to run on " + HOST + ", test cannot access it's management API on port "
+ + MGMT_PORT);
}
}
@@ -75,12 +75,11 @@
new DeploymentBuilder(HOST, MGMT_PORT).add(file).deploy();
}
-
@Ignore
@Test
public void returnsDeployables() throws DeploymentException, URISyntaxException, IOException {
String warName = "minimalistic.war";
- File file = getWarFile(warName );
+ File file = getWarFile(warName);
List<Deployable> deployables = new DeploymentBuilder(HOST, MGMT_PORT).add(file).deploy();
assertEquals(1, deployables.size());
assertEquals(warName, deployables.get(0).getName());
@@ -93,25 +92,41 @@
Deployable deployable = deployables.get(0);
assertNotNull(deployable.getStatus());
}
-
+
@Test
public void isDeployed() throws DeploymentException, URISyntaxException, IOException {
String warName = "minimalistic.war";
- File file = getWarFile(warName );
+ File file = getWarFile(warName);
List<Deployable> deployables = new DeploymentBuilder(HOST, MGMT_PORT).add(file).deploy();
Deployable deployable = deployables.get(0);
deployable.getStatus(); // wait for deployment to have finished
- String name = deployable.getName().substring(0, deployable.getName().indexOf('.'));
- String response = getServerResponse(new URL(MessageFormat.format("http://{0}:{1}/{2}", HOST, String.valueOf(WEB_PORT), name)));
+ String response = getServerResponse(new URL(
+ MessageFormat.format("http://{0}:{1}/{2}",
+ HOST,
+ String.valueOf(WEB_PORT),
+ getWebappname(deployable.getName()))));
assertTrue(response.indexOf("minimalistic") >= 0);
}
+ /**
+ * cuts off the .war suffix
+ * @param deployableName
+ * @return
+ */
+ private String getWebappname(String deployableName) {
+ int suffixIndex = deployableName.indexOf('.');
+ if (suffixIndex < 0) {
+ return deployableName;
+ }
+ return deployableName.substring(0, suffixIndex);
+ }
+
private File getWarFile(String name) throws URISyntaxException, IOException {
Bundle bundle = Platform.getBundle(BUNDLE_ID);
URL entryUrl = bundle.getEntry(WAR_FOLDER + name);
return new File(FileLocator.resolve(entryUrl).toURI());
}
-
+
private String getServerResponse(URL url) throws IOException {
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
connection.setUseCaches(false);
@@ -126,7 +141,7 @@
private String toString(BufferedInputStream in) throws IOException {
StringWriter writer = new StringWriter();
- for(int data = -1; ((data = in.read()) != -1); ) {
+ for (int data = -1; ((data = in.read()) != -1);) {
writer.write(data);
}
return writer.toString();
13 years, 6 months
JBoss Tools SVN: r30483 - workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-04-11 13:37:33 -0400 (Mon, 11 Apr 2011)
New Revision: 30483
Modified:
workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentBuilderIntegrationTest.java
Log:
[JBIDE-8690] added test that checks if app was deployed
Modified: workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentBuilderIntegrationTest.java
===================================================================
--- workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentBuilderIntegrationTest.java 2011-04-11 17:36:12 UTC (rev 30482)
+++ workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentBuilderIntegrationTest.java 2011-04-11 17:37:33 UTC (rev 30483)
@@ -101,7 +101,8 @@
List<Deployable> deployables = new DeploymentBuilder(HOST, MGMT_PORT).add(file).deploy();
Deployable deployable = deployables.get(0);
deployable.getStatus(); // wait for deployment to have finished
- String response = getServerResponse(new URL(MessageFormat.format("http://{0}:{1}/{2}", HOST, WEB_PORT, deployable.getName())));
+ String name = deployable.getName().substring(0, deployable.getName().indexOf('.'));
+ String response = getServerResponse(new URL(MessageFormat.format("http://{0}:{1}/{2}", HOST, String.valueOf(WEB_PORT), name)));
assertTrue(response.indexOf("minimalistic") >= 0);
}
13 years, 6 months
JBoss Tools SVN: r30482 - in workspace/adietish/org.jboss.ide.eclipse.as7.deployment: META-INF and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-04-11 13:36:12 -0400 (Mon, 11 Apr 2011)
New Revision: 30482
Added:
workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-controller-7.0.0.Beta2-sources.jar
workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-controller-7.0.0.Beta2.jar
workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-threads-7.0.0.Beta2-sources.jar
workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-threads-7.0.0.Beta2.jar
workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-logging-3.0.0.Beta5-sources.jar
workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-logging-3.0.0.Beta5.jar
Modified:
workspace/adietish/org.jboss.ide.eclipse.as7.deployment/.classpath
workspace/adietish/org.jboss.ide.eclipse.as7.deployment/META-INF/MANIFEST.MF
workspace/adietish/org.jboss.ide.eclipse.as7.deployment/build.properties
Log:
[JBIDE-8690] replaced Beta3 jars with equivalents from Beta2, added documentation
Modified: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/.classpath
===================================================================
--- workspace/adietish/org.jboss.ide.eclipse.as7.deployment/.classpath 2011-04-11 17:32:18 UTC (rev 30481)
+++ workspace/adietish/org.jboss.ide.eclipse.as7.deployment/.classpath 2011-04-11 17:36:12 UTC (rev 30482)
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
+ <classpathentry exported="true" kind="lib" path="jboss-logging-3.0.0.Beta5.jar"/>
+ <classpathentry exported="true" kind="lib" path="jboss-as-controller-7.0.0.Beta2.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
@@ -8,7 +10,7 @@
<classpathentry kind="lib" path="jboss-as-protocol-7.0.0.Beta2-sources.jar"/>
<classpathentry kind="lib" path="jboss-dmr-1.0.0.Beta5-sources.jar"/>
<classpathentry kind="lib" path="jboss-threads-2.0.0.CR8-sources.jar"/>
- <classpathentry kind="lib" path="jboss-as-controller-client-7.0.0.Beta2.jar"/>
+ <classpathentry kind="lib" path="jboss-as-controller-client-7.0.0.Beta2.jar" sourcepath="jboss-as-controller-client-7.0.0.Beta2-sources.jar"/>
<classpathentry kind="lib" path="jboss-as-logging-7.0.0.Beta2.jar"/>
<classpathentry kind="lib" path="jboss-as-protocol-7.0.0.Beta2.jar"/>
<classpathentry kind="lib" path="jboss-dmr-1.0.0.Beta5.jar"/>
@@ -16,5 +18,9 @@
<classpathentry kind="lib" path="jboss-marshalling-1.3.0.CR8.jar"/>
<classpathentry kind="lib" path="jboss-threads-2.0.0.CR8.jar"/>
<classpathentry kind="lib" path="shrinkwrap-api-1.0.0-alpha-11.jar"/>
+ <classpathentry kind="lib" path="jboss-as-controller-7.0.0.Beta2-sources.jar"/>
+ <classpathentry kind="lib" path="jboss-as-threads-7.0.0.Beta2-sources.jar"/>
+ <classpathentry kind="lib" path="jboss-as-threads-7.0.0.Beta2.jar"/>
+ <classpathentry kind="lib" path="jboss-logging-3.0.0.Beta5-sources.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/META-INF/MANIFEST.MF
===================================================================
--- workspace/adietish/org.jboss.ide.eclipse.as7.deployment/META-INF/MANIFEST.MF 2011-04-11 17:32:18 UTC (rev 30481)
+++ workspace/adietish/org.jboss.ide.eclipse.as7.deployment/META-INF/MANIFEST.MF 2011-04-11 17:36:12 UTC (rev 30482)
@@ -8,13 +8,16 @@
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ClassPath: .,
+ jboss-as-logging-7.0.0.Beta2.jar,
jboss-as-controller-client-7.0.0.Beta2.jar,
- jboss-as-logging-7.0.0.Beta2.jar,
jboss-as-protocol-7.0.0.Beta2.jar,
jboss-as-threads-7.0.0.Beta2.jar,
jboss-dmr-1.0.0.Beta5.jar,
jboss-marshalling-1.3.0.CR8.jar,
shrinkwrap-api-1.0.0-alpha-11.jar,
- jboss-threads-2.0.0.CR8.jar
+ jboss-threads-2.0.0.CR8.jar,
+ jboss-as-controller-7.0.0.Beta2.jar,
+ jboss-as-threads-7.0.0.Beta2.jar,
+ jboss-logging-3.0.0.Beta5.jar
Export-Package: org.jboss.ide.eclipse.as7.deployment
Bundle-Vendor: JBoss by Red Hat
Modified: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/build.properties
===================================================================
--- workspace/adietish/org.jboss.ide.eclipse.as7.deployment/build.properties 2011-04-11 17:32:18 UTC (rev 30481)
+++ workspace/adietish/org.jboss.ide.eclipse.as7.deployment/build.properties 2011-04-11 17:36:12 UTC (rev 30482)
@@ -8,7 +8,9 @@
jboss-dmr-1.0.0.Beta5.jar,\
jboss-marshalling-1.3.0.CR8.jar,\
shrinkwrap-api-1.0.0-alpha-11.jar,\
- jboss-threads-2.0.0.CR8.jar
+ jboss-threads-2.0.0.CR8.jar,\
+ jboss-as-controller-7.0.0.Beta2.jar,\
+ jboss-logging-3.0.0.Beta5.jar
src.includes = jboss-as-controller-client-7.0.0.Beta2-sources.jar,\
jboss-as-controller-client-7.0.0.Beta2.jar,\
jboss-as-logging-7.0.0.Beta2-sources.jar,\
@@ -21,4 +23,6 @@
jboss-marshalling-1.3.0.CR8.jar,\
jboss-threads-2.0.0.CR8-sources.jar,\
jboss-threads-2.0.0.CR8.jar,\
- shrinkwrap-api-1.0.0-alpha-11.jar
+ shrinkwrap-api-1.0.0-alpha-11.jar,\
+ jboss-as-controller-7.0.0.Beta2.jar,\
+ jboss-as-controller-7.0.0.Beta2-sources.jar
Added: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-controller-7.0.0.Beta2-sources.jar
===================================================================
(Binary files differ)
Property changes on: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-controller-7.0.0.Beta2-sources.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-controller-7.0.0.Beta2.jar
===================================================================
(Binary files differ)
Property changes on: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-controller-7.0.0.Beta2.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-threads-7.0.0.Beta2-sources.jar
===================================================================
(Binary files differ)
Property changes on: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-threads-7.0.0.Beta2-sources.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-threads-7.0.0.Beta2.jar
===================================================================
(Binary files differ)
Property changes on: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-threads-7.0.0.Beta2.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-logging-3.0.0.Beta5-sources.jar
===================================================================
(Binary files differ)
Property changes on: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-logging-3.0.0.Beta5-sources.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-logging-3.0.0.Beta5.jar
===================================================================
(Binary files differ)
Property changes on: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-logging-3.0.0.Beta5.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
13 years, 6 months