JBoss Tools SVN: r42772 - in trunk/jst/plugins: org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-07-27 19:26:37 -0400 (Fri, 27 Jul 2012)
New Revision: 42772
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/JSPProblemMarkerResolutionGenerator.java
Log:
https://issues.jboss.org/browse/JBIDE-12373 Update RequiredExecutionEnvironment to Java 1.6 for Common/CDI/Seam/JSF components
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java 2012-07-27 23:15:40 UTC (rev 42771)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java 2012-07-27 23:26:37 UTC (rev 42772)
@@ -116,7 +116,7 @@
*/
@Override
public List<ITagLibrary> getAllTagLibraries() {
- Set<ITagLibrary> libs = libraries.getAllLibraries();
+ Collection<ITagLibrary> libs = libraries.getAllLibraries();
List<ITagLibrary> result = StaticLibraries.instance.getAllTagLibraries();
result.addAll(libs);
return result;
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/JSPProblemMarkerResolutionGenerator.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/JSPProblemMarkerResolutionGenerator.java 2012-07-27 23:15:40 UTC (rev 42771)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/JSPProblemMarkerResolutionGenerator.java 2012-07-27 23:26:37 UTC (rev 42772)
@@ -128,7 +128,7 @@
IKbProject kbProject = KbProjectFactory.getKbProject(file.getProject(), true);
- ITagLibrary[] libraries = kbProject.getTagLibraries();
+ List<ITagLibrary> libraries = kbProject.getAllTagLibraries();
ArrayList<String> names = new ArrayList<String>();
boolean worked = false;
for(ITagLibrary l : libraries){
@@ -211,7 +211,7 @@
IKbProject kbProject = KbProjectFactory.getKbProject(file.getProject(), true);
- ITagLibrary[] libraries = kbProject.getTagLibraries();
+ List<ITagLibrary> libraries = kbProject.getAllTagLibraries();
ArrayList<String> names = new ArrayList<String>();
boolean worked = false;
for(ITagLibrary l : libraries){
13 years, 2 months
JBoss Tools SVN: r42771 - in trunk/jsf/tests/org.jboss.tools.jsf.test: src/org/jboss/tools/jsf/test/validation and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-07-27 19:15:40 -0400 (Fri, 27 Jul 2012)
New Revision: 42771
Added:
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/WebContent/pages/a.xml
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/ELValidatorTest.java
Log:
JBIDE-12358
https://issues.jboss.org/browse/JBIDE-12358
Test is added.
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/WebContent/pages/a.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/WebContent/pages/a.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/WebContent/pages/a.xml 2012-07-27 23:15:40 UTC (rev 42771)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<arquillian xmlns="http://jboss.org/schema/arquillian"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
+
+ <container qualifier="managed-jboss" default="true">
+ <configuration>
+ <property name="jbossHome">target/jboss-as-${jboss.version:7.1.1.Final}</property>
+ <property name="jbossHome">target/jboss-as-#{jboss.version:7.1.1.Final}</property>
+ </configuration>
+ </container>
+</arquillian>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/WebContent/pages/a.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/ELValidatorTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/ELValidatorTest.java 2012-07-27 23:13:10 UTC (rev 42770)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/ELValidatorTest.java 2012-07-27 23:15:40 UTC (rev 42771)
@@ -281,6 +281,17 @@
AbstractResourceMarkerTest.assertMarkerIsCreated(file, messagePattern, false, 8);
}
+ public void testSyntaxErrorsInXML() throws CoreException, ValidationException {
+ IFile file = project.getFile("WebContent/pages/a.xml");
+
+ TestUtil.validate(file);
+
+ String messagePattern = MessageFormat.format(ELValidationMessages.EL_SYNTAX_ERROR, new Object[]{ElCoreMessages.OperationRule_ExpectingRBrace});
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, messagePattern, false, 9);
+
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, messagePattern, 8);
+ }
+
private long validateFile(String fileName, int numberOfMarkers) throws ValidationException {
Set<String> files = new HashSet<String>();
files.add(fileName);
13 years, 2 months
JBoss Tools SVN: r42770 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-07-27 19:13:10 -0400 (Fri, 27 Jul 2012)
New Revision: 42770
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java
Log:
JBIDE-12358
https://issues.jboss.org/browse/JBIDE-12358
Test is added.
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java 2012-07-27 22:03:45 UTC (rev 42769)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java 2012-07-27 23:13:10 UTC (rev 42770)
@@ -41,6 +41,7 @@
import org.jboss.tools.common.EclipseUtil;
import org.jboss.tools.common.el.core.ELReference;
import org.jboss.tools.common.el.core.model.ELExpression;
+import org.jboss.tools.common.el.core.model.ELInstance;
import org.jboss.tools.common.el.core.model.ELInvocationExpression;
import org.jboss.tools.common.el.core.model.ELPropertyInvocation;
import org.jboss.tools.common.el.core.parser.ELParserFactory;
@@ -293,7 +294,7 @@
disableProblemAnnotations(el);
}
- if(context!=null && !el.getSyntaxErrors().isEmpty()) {
+ if(context!=null && !el.getSyntaxErrors().isEmpty() && !isDollarExpressionInXML(el)) {
for (SyntaxError error: el.getSyntaxErrors()) {
markers++;
IJavaSourceReference reference = getJavaReference(el.getResource(), el.getStartPosition() + error.getPosition(), 1);
@@ -318,6 +319,20 @@
}
}
+ private boolean isDollarExpressionInXML(ELReference el) {
+ String ext = el.getResource().getFileExtension();
+ return ("xml".equals(ext) && isDollarExpression(el));
+ }
+ private boolean isDollarExpression(ELReference el) {
+ List<ELInstance> is = el.getELModel().getInstances();
+ for (ELInstance i:is) {
+ if(i.getFirstToken().getText().equals("${")) {
+ return true;
+ }
+ }
+ return false;
+ }
+
private void validateELExpression(ELReference elReference, ELExpression el, boolean asYouType, ELContext context) {
List<ELInvocationExpression> es = el.getInvocations();
for (ELInvocationExpression token: es) {
13 years, 2 months
JBoss Tools SVN: r42769 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/taglib.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-07-27 18:03:45 -0400 (Fri, 27 Jul 2012)
New Revision: 42769
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/taglib/TagLibraryManager.java
Log:
https://issues.jboss.org/browse/JBIDE-12304 Make Quick Fix "Add tag library definition" work with KB Model instead of using plain tag library list
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/taglib/TagLibraryManager.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/taglib/TagLibraryManager.java 2012-07-27 20:34:46 UTC (rev 42768)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/taglib/TagLibraryManager.java 2012-07-27 22:03:45 UTC (rev 42769)
@@ -19,7 +19,11 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEntry;
+import org.eclipse.wst.xml.core.internal.catalog.Catalog;
+import org.eclipse.wst.xml.core.internal.catalog.CatalogEntry;
+import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
+import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogElement;
+import org.eclipse.wst.xml.core.internal.catalog.provisional.INextCatalog;
import org.jboss.tools.jst.web.kb.IKbProject;
import org.jboss.tools.jst.web.kb.KbProjectFactory;
import org.jboss.tools.jst.web.kb.WebKbPlugin;
@@ -106,14 +110,23 @@
public static List<File> getStaticTagLibs() {
List<File> files = new ArrayList<File>();
try {
- ICatalogEntry[] entries = XMLCorePlugin.getDefault().getDefaultXMLCatalog().getCatalogEntries();
- for (ICatalogEntry entry : entries) {
- String uri = entry.getURI();
- if(uri!=null && uri.endsWith(".tld") && uri.endsWith(".xml")) {
- File file = new File(new URL(uri).getFile());
- if(file.exists()) {
- files.add(file);
- }
+ INextCatalog[] catalogs = XMLCorePlugin.getDefault().getDefaultXMLCatalog().getNextCatalogs();
+ for (INextCatalog catalog : catalogs) {
+ ICatalog c = catalog.getReferencedCatalog();
+ if(c instanceof Catalog) {
+ ICatalogElement[] elements = ((Catalog)c).getCatalogElements();
+ for (ICatalogElement element : elements) {
+ if(element instanceof CatalogEntry) {
+ CatalogEntry entry = (CatalogEntry)element;
+ String uri = entry.getURI();
+ if(uri!=null && (uri.endsWith(".tld") || uri.endsWith(".xml")) && (uri.startsWith("file:") || uri.startsWith("jar:"))) {
+ File file = new File(new URL(uri).getFile());
+ if(file.exists()) {
+ files.add(file);
+ }
+ }
+ }
+ }
}
}
} catch (IOException e) {
13 years, 2 months
JBoss Tools SVN: r42768 - in trunk: jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-07-27 16:34:46 -0400 (Fri, 27 Jul 2012)
New Revision: 42768
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/kb/test/WebWithModuleTest.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/IKbProject.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/LibraryStorage.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/StaticLibraries.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractAttribute.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractTagLib.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/FaceletTagLibrary.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/FunctionTagLib.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/taglib/TagLibraryManager.java
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/KbMockModelTest.java
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/WebWithModuleTest.java
Log:
https://issues.jboss.org/browse/JBIDE-12304 Make Quick Fix "Add tag library definition" work with KB Model instead of using plain tag library list
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/kb/test/WebWithModuleTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/kb/test/WebWithModuleTest.java 2012-07-27 16:07:57 UTC (rev 42767)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/kb/test/WebWithModuleTest.java 2012-07-27 20:34:46 UTC (rev 42768)
@@ -56,7 +56,7 @@
IKbProject kbUtility = KbProjectFactory.getKbProject(utility, true);
assertNotNull(kbUtility);
int w = 0;
- while(kbUtility.getTagLibraries().length == 0 && w++ < 50) {
+ while(kbUtility.getProjectTagLibraries().length == 0 && w++ < 50) {
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/IKbProject.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/IKbProject.java 2012-07-27 16:07:57 UTC (rev 42767)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/IKbProject.java 2012-07-27 20:34:46 UTC (rev 42768)
@@ -10,6 +10,8 @@
******************************************************************************/
package org.jboss.tools.jst.web.kb;
+import java.util.List;
+
import org.eclipse.core.resources.IProjectNature;
import org.eclipse.core.runtime.IPath;
import org.jboss.tools.common.validation.IProjectValidationContext;
@@ -26,12 +28,20 @@
public static String NATURE_ID = WebKbPlugin.PLUGIN_ID + ".kbnature"; //$NON-NLS-1$
/**
- * Returns all available tag libraries.
+ * Returns all available tag libraries of the project.
+ * Doesn't returns libraries from XML Catalog.
+ * The same as getTagLibraries(false);
* @return
*/
- ITagLibrary[] getTagLibraries();
+ ITagLibrary[] getProjectTagLibraries();
/**
+ * Returns all available tag libraries including static libraries from XML Catalog.
+ * @return
+ */
+ List<ITagLibrary> getAllTagLibraries();
+
+ /**
* Returns tag libraries by URI
* @param uri
* @return
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java 2012-07-27 16:07:57 UTC (rev 42767)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java 2012-07-27 20:34:46 UTC (rev 42768)
@@ -100,16 +100,30 @@
public void setMock() {
isMock = true;
}
+
/*
* (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.IKbProject#getTagLibraries()
+ * @see org.jboss.tools.jst.web.kb.IKbProject#getProjectTagLibraries()
*/
- public ITagLibrary[] getTagLibraries() {
+ @Override
+ public ITagLibrary[] getProjectTagLibraries() {
return libraries.getAllLibrariesArray();
}
/*
* (non-Javadoc)
+ * @see org.jboss.tools.jst.web.kb.IKbProject#getAllTagLibraries(boolean)
+ */
+ @Override
+ public List<ITagLibrary> getAllTagLibraries() {
+ Set<ITagLibrary> libs = libraries.getAllLibraries();
+ List<ITagLibrary> result = StaticLibraries.instance.getAllTagLibraries();
+ result.addAll(libs);
+ return result;
+ }
+
+ /*
+ * (non-Javadoc)
* @see org.jboss.tools.jst.web.kb.IKbProject#getTagLibraries(java.lang.String)
*/
public ITagLibrary[] getTagLibraries(String uri) {
@@ -664,7 +678,7 @@
*/
Map<IPath, LoadedDeclarations> getAllDeclarations() throws CloneNotSupportedException {
Map<IPath, LoadedDeclarations> map = new HashMap<IPath, LoadedDeclarations>();
- for (ITagLibrary f : getTagLibraries()) {
+ for (ITagLibrary f : getProjectTagLibraries()) {
IPath p = f.getSourcePath();
if(p == null || EclipseResourceUtil.isJar(p.toString())) continue;
LoadedDeclarations ds = map.get(p);
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/LibraryStorage.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/LibraryStorage.java 2012-07-27 16:07:57 UTC (rev 42767)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/LibraryStorage.java 2012-07-27 20:34:46 UTC (rev 42768)
@@ -50,6 +50,10 @@
return allLibrariesArray;
}
+ synchronized Set<ITagLibrary> getAllLibraries() {
+ return allLibraries;
+ }
+
public synchronized ITagLibrary[] getLibrariesArray(String uri) {
ITagLibrary[] result = librariesByUriArray.get(uri);
if(result == null) {
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/StaticLibraries.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/StaticLibraries.java 2012-07-27 16:07:57 UTC (rev 42767)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/StaticLibraries.java 2012-07-27 20:34:46 UTC (rev 42768)
@@ -10,11 +10,12 @@
******************************************************************************/
package org.jboss.tools.jst.web.kb.internal;
-
import java.io.File;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import org.eclipse.core.runtime.Path;
import org.jboss.tools.common.model.XModelObject;
@@ -35,7 +36,7 @@
LibraryStorage libraries = new LibraryStorage();
Map<File, XModelObject> loadedFolders = new HashMap<File, XModelObject>();
Map<File, XModelObject> loadedFiles = new HashMap<File, XModelObject>();
-
+
private StaticLibraries() {}
public ITagLibrary[] getLibraries(String uri) {
@@ -44,6 +45,11 @@
if(loadedFiles.containsKey(file)) {
return libraries.getLibrariesArray(uri);
}
+ addLib(file);
+ return libraries.getLibrariesArray(uri);
+ }
+
+ private void addLib(File file) {
File folder = file.getParentFile();
if(!loadedFolders.containsKey(folder)) {
XModelObject o = EclipseResourceUtil.createObjectForLocation(file.getAbsolutePath());
@@ -64,8 +70,18 @@
}
}
}
-
- return libraries.getLibrariesArray(uri);
}
-}
+ public List<ITagLibrary> getAllTagLibraries() {
+ List<ITagLibrary> libs = new ArrayList<ITagLibrary>();
+ List<File> files = TagLibraryManager.getStaticTagLibs();
+ for (File file : files) {
+ if(!loadedFiles.containsKey(file)) {
+ addLib(file);
+ }
+ Set<ITagLibrary> ls = libraries.getLibrariesBySource(new Path(file.getAbsolutePath()));
+ libs.addAll(ls);
+ }
+ return libs;
+ }
+}
\ No newline at end of file
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractAttribute.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractAttribute.java 2012-07-27 16:07:57 UTC (rev 42767)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractAttribute.java 2012-07-27 20:34:46 UTC (rev 42768)
@@ -42,6 +42,7 @@
/* (non-Javadoc)
* @see org.jboss.tools.jst.web.kb.taglib.IAttribute#getDescription()
*/
+ @Override
public String getDescription() {
return description;
}
@@ -61,6 +62,7 @@
/* (non-Javadoc)
* @see org.jboss.tools.jst.web.kb.taglib.IAttribute#getName()
*/
+ @Override
public String getName() {
return name;
}
@@ -80,6 +82,7 @@
/* (non-Javadoc)
* @see org.jboss.tools.jst.web.kb.taglib.IAttribute#isPreferable()
*/
+ @Override
public boolean isPreferable() {
return isRequired();
}
@@ -87,6 +90,7 @@
/* (non-Javadoc)
* @see org.jboss.tools.jst.web.kb.taglib.IAttribute#isRequired()
*/
+ @Override
public boolean isRequired() {
return required;
}
@@ -107,6 +111,7 @@
* (non-Javadoc)
* @see org.jboss.tools.jst.web.kb.taglib.IAttribute#getComponent()
*/
+ @Override
public IComponent getComponent() {
return (IComponent)parent;
}
@@ -115,6 +120,7 @@
* (non-Javadoc)
* @see org.jboss.tools.jst.web.kb.IProposalProcessor#getProposals(org.jboss.tools.jst.web.kb.KbQuery, org.jboss.tools.jst.web.kb.IPageContext)
*/
+ @Override
public TextProposal[] getProposals(KbQuery query, IPageContext context) {
return EMPTY_PROPOSAL_LIST;
}
@@ -176,7 +182,7 @@
@Override
public Element toXML(Element parent, Properties context) {
Element element = super.toXML(parent, context);
-
+
if(attributesInfo.get(XMLStoreConstants.ATTR_NAME) == null && name != null) {
element.setAttribute(XMLStoreConstants.ATTR_NAME, name);
}
@@ -207,9 +213,7 @@
*/
@Override
protected void saveAttributesInfo(Element element, Properties context) {
- if(context.get(XMLStoreConstants.KEY_MODEL_OBJECT) == getId()) {
-
- } else {
+ if(context.get(XMLStoreConstants.KEY_MODEL_OBJECT) != getId()) {
super.saveAttributesInfo(element, context);
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractTagLib.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractTagLib.java 2012-07-27 16:07:57 UTC (rev 42767)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractTagLib.java 2012-07-27 20:34:46 UTC (rev 42768)
@@ -44,7 +44,6 @@
* Abstract implementation of ITagLibrary
* @author Alexey Kazakov
*/
-
public abstract class AbstractTagLib extends KbObject implements ITagLibrary {
public static String URI = "uri"; //$NON-NLS-1$
@@ -60,6 +59,7 @@
/* (non-Javadoc)
* @see org.jboss.tools.jst.web.kb.taglib.TagLibrary#getAllComponents()
*/
+ @Override
public IComponent[] getComponents() {
if(componentsArray==null) {
synchronized (components) {
@@ -72,6 +72,7 @@
/* (non-Javadoc)
* @see org.jboss.tools.jst.web.kb.taglib.TagLibrary#getComponent(java.lang.String)
*/
+ @Override
public IComponent getComponent(String name) {
if(ignoreCase) {
name = name.toLowerCase();
@@ -83,6 +84,7 @@
* (non-Javadoc)
* @see org.jboss.tools.jst.web.kb.taglib.ITagLibrary#getComponentByType(java.lang.String)
*/
+ @Override
public IComponent getComponentByType(String type) {
IComponent[] comps = getComponents();
for (int i = 0; i < comps.length; i++) {
@@ -96,6 +98,7 @@
/* (non-Javadoc)
* @see org.jboss.tools.jst.web.kb.taglib.TagLibrary#getComponents(java.lang.String)
*/
+ @Override
public IComponent[] getComponents(String nameTemplate) {
return getComponents(nameTemplate, null);
}
@@ -121,6 +124,7 @@
/* (non-Javadoc)
* @see org.jboss.tools.jst.web.kb.taglib.ITagLibrary#getComponents(org.jboss.tools.jst.web.kb.KbQuery, org.jboss.tools.jst.web.kb.PageContext)
*/
+ @Override
public IComponent[] getComponents(KbQuery query, IPageContext context) {
List<String> prefixes = getPrefixes(query, context);
return getComponentsByPrefixes(query, prefixes, context);
@@ -347,6 +351,7 @@
/* (non-Javadoc)
* @see org.jboss.tools.jst.web.kb.taglib.TagLibrary#getResource()
*/
+ @Override
public IResource getResource() {
if(resource != null) return resource;
if(source != null) {
@@ -365,6 +370,7 @@
/* (non-Javadoc)
* @see org.jboss.tools.jst.web.kb.taglib.IComponent#getNameSpace()
*/
+ @Override
public INameSpace getDefaultNameSpace() {
return nameSpace;
}
@@ -379,6 +385,7 @@
/* (non-Javadoc)
* @see org.jboss.tools.jst.web.kb.taglib.TagLibrary#getURI()
*/
+ @Override
public String getURI() {
return uri;
}
@@ -399,6 +406,7 @@
* (non-Javadoc)
* @see org.jboss.tools.jst.web.kb.taglib.ITagLibrary#getVersion()
*/
+ @Override
public String getVersion() {
return version;
}
@@ -413,6 +421,7 @@
/* (non-Javadoc)
* @see org.jboss.tools.jst.web.kb.ProposalProcessor#getProposals(org.jboss.tools.jst.web.kb.KbQuery, org.jboss.tools.jst.web.kb.PageContext)
*/
+ @Override
public TextProposal[] getProposals(KbQuery query, IPageContext context) {
List<String> prefixes = getPrefixes(query, context);
List<TextProposal> proposals = new ArrayList<TextProposal>();
@@ -548,6 +557,7 @@
private void clearComponentArrays() {
componentsArray = null;
}
+
/*
* (non-Javadoc)
* @see org.jboss.tools.jst.web.kb.internal.KbObject#getXMLName()
@@ -621,5 +631,4 @@
protected void loadAttributeValues(Element element) {
setURI(attributesInfo.get(URI));
}
-
}
\ No newline at end of file
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/FaceletTagLibrary.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/FaceletTagLibrary.java 2012-07-27 16:07:57 UTC (rev 42767)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/FaceletTagLibrary.java 2012-07-27 20:34:46 UTC (rev 42768)
@@ -22,12 +22,13 @@
public FaceletTagLibrary() {
}
+ @Override
public FaceletTagLibrary clone() throws CloneNotSupportedException {
return (FaceletTagLibrary)super.clone();
}
+ @Override
public String getXMLClass() {
return KbXMLStoreConstants.CLS_FACELET_LIBRARY;
}
-
-}
+}
\ No newline at end of file
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/FunctionTagLib.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/FunctionTagLib.java 2012-07-27 16:07:57 UTC (rev 42767)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/FunctionTagLib.java 2012-07-27 20:34:46 UTC (rev 42768)
@@ -35,6 +35,7 @@
public FunctionTagLib() {}
+ @Override
public IELFunction[] getFunctions() {
if(functionArray == null) {
functionArray = functions.toArray(new ELFunction[0]);
@@ -42,6 +43,7 @@
return functionArray;
}
+ @Override
public FunctionTagLib clone() throws CloneNotSupportedException {
FunctionTagLib copy = (FunctionTagLib)super.clone();
copy.functions = new ArrayList<ELFunction>();
@@ -57,6 +59,7 @@
functionArray = null;
}
+ @Override
public List<Change> merge(KbObject s) {
List<Change> changes = super.merge(s);
FunctionTagLib t = (FunctionTagLib)s;
@@ -95,6 +98,7 @@
}
}
+ @Override
public Element toXML(Element parent, Properties context) {
Element element = super.toXML(parent, context);
@@ -105,9 +109,10 @@
return element;
}
+ @Override
public void loadXML(Element element, Properties context) {
super.loadXML(element, context);
-
+
Element[] cs = XMLUtilities.getChildren(element, KbXMLStoreConstants.TAG_FUNCTION);
for (Element e: cs) {
ELFunction f = new ELFunction();
@@ -115,5 +120,4 @@
addFunction(f);
}
}
-
-}
+}
\ No newline at end of file
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/taglib/TagLibraryManager.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/taglib/TagLibraryManager.java 2012-07-27 16:07:57 UTC (rev 42767)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/taglib/TagLibraryManager.java 2012-07-27 20:34:46 UTC (rev 42768)
@@ -13,10 +13,13 @@
import java.io.File;
import java.io.IOException;
import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
+import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEntry;
import org.jboss.tools.jst.web.kb.IKbProject;
import org.jboss.tools.jst.web.kb.KbProjectFactory;
import org.jboss.tools.jst.web.kb.WebKbPlugin;
@@ -37,7 +40,7 @@
if(kbProject == null) {
return new ITagLibrary[0];
}
- return uri==null?kbProject.getTagLibraries():kbProject.getTagLibraries(uri);
+ return uri==null?kbProject.getProjectTagLibraries():kbProject.getTagLibraries(uri);
}
/**
@@ -92,4 +95,30 @@
return null;
}
+
+ /**
+ * Returns all the tag libraries which are available for all the projects
+ * even if the lib are not in the project classpath.
+ * These libs should be registered in XML Catalog via plugin.xml.
+ * @param uri
+ * @return
+ */
+ public static List<File> getStaticTagLibs() {
+ List<File> files = new ArrayList<File>();
+ try {
+ ICatalogEntry[] entries = XMLCorePlugin.getDefault().getDefaultXMLCatalog().getCatalogEntries();
+ for (ICatalogEntry entry : entries) {
+ String uri = entry.getURI();
+ if(uri!=null && uri.endsWith(".tld") && uri.endsWith(".xml")) {
+ File file = new File(new URL(uri).getFile());
+ if(file.exists()) {
+ files.add(file);
+ }
+ }
+ }
+ } catch (IOException e) {
+ WebKbPlugin.getDefault().logError(e);
+ }
+ return files;
+ }
}
\ No newline at end of file
Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/KbMockModelTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/KbMockModelTest.java 2012-07-27 16:07:57 UTC (rev 42767)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/KbMockModelTest.java 2012-07-27 20:34:46 UTC (rev 42768)
@@ -64,7 +64,7 @@
kbProject = KbProjectFactory.getKbProject(project, true, false);
assertNotNull(kbProject);
- ITagLibrary[] ls = kbProject.getTagLibraries();
+ ITagLibrary[] ls = kbProject.getProjectTagLibraries();
assertTrue(ls.length > 0);
}
Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/WebWithModuleTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/WebWithModuleTest.java 2012-07-27 16:07:57 UTC (rev 42767)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/WebWithModuleTest.java 2012-07-27 20:34:46 UTC (rev 42768)
@@ -55,7 +55,7 @@
IKbProject kbUtility = KbProjectFactory.getKbProject(utility, true);
assertNotNull(kbUtility);
int w = 0;
- while(kbUtility.getTagLibraries().length == 0 && w++ < 50) {
+ while(kbUtility.getProjectTagLibraries().length == 0 && w++ < 50) {
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
13 years, 2 months
JBoss Tools SVN: r42767 - in trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test: as5 and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-07-27 12:07:57 -0400 (Fri, 27 Jul 2012)
New Revision: 42767
Added:
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/CreateAS5Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/DeployJSPProjectAS5Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/OperateAS5Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/UndeployJSPProjectAS5Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/HotDeployJSPFile.java
Removed:
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/HotDeployJSPFile.java
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAPCompatibilitySuite.java
Log:
Added JBoss AS 5 tests
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java 2012-07-27 15:58:11 UTC (rev 42766)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java 2012-07-27 16:07:57 UTC (rev 42767)
@@ -1,15 +1,19 @@
package org.jboss.ide.eclipse.as.ui.bot.test;
+import org.jboss.ide.eclipse.as.ui.bot.test.as5.CreateAS5Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as5.DeployJSPProjectAS5Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as5.OperateAS5Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as5.UndeployJSPProjectAS5Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as6.CreateAS6Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as6.DeployJSPProjectAS6Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as6.OperateAS6Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as6.UndeployJSPProjectAS6Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as7.CreateAS7Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as7.DeployJSPProjectAS7Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as7.HotDeployJSPFile;
import org.jboss.ide.eclipse.as.ui.bot.test.as7.OperateAS7Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as7.UndeployJSPProjectAS7Server;
import org.jboss.ide.eclipse.as.ui.bot.test.template.DeleteServer;
+import org.jboss.ide.eclipse.as.ui.bot.test.template.HotDeployJSPFile;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -18,13 +22,17 @@
@Suite.SuiteClasses({
CreateAS7Server.class,
CreateAS6Server.class,
+ CreateAS5Server.class,
OperateAS7Server.class,
OperateAS6Server.class,
+ OperateAS5Server.class,
DeployJSPProjectAS7Server.class,
DeployJSPProjectAS6Server.class,
+ DeployJSPProjectAS5Server.class,
HotDeployJSPFile.class,
UndeployJSPProjectAS7Server.class,
UndeployJSPProjectAS6Server.class,
+ UndeployJSPProjectAS5Server.class,
DeleteServer.class
})
public class AllTestsSuite {
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAPCompatibilitySuite.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAPCompatibilitySuite.java 2012-07-27 15:58:11 UTC (rev 42766)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAPCompatibilitySuite.java 2012-07-27 16:07:57 UTC (rev 42767)
@@ -2,10 +2,10 @@
import org.jboss.ide.eclipse.as.ui.bot.test.as7.CreateAS7Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as7.DeployJSPProjectAS7Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as7.HotDeployJSPFile;
import org.jboss.ide.eclipse.as.ui.bot.test.as7.OperateAS7Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as7.UndeployJSPProjectAS7Server;
import org.jboss.ide.eclipse.as.ui.bot.test.template.DeleteServer;
+import org.jboss.ide.eclipse.as.ui.bot.test.template.HotDeployJSPFile;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/CreateAS5Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/CreateAS5Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/CreateAS5Server.java 2012-07-27 16:07:57 UTC (rev 42767)
@@ -0,0 +1,44 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as5;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
+import java.util.List;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.CreateServerTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+import org.jboss.tools.ui.bot.ext.entity.XMLConfiguration;
+
+/**
+*
+* @see CreateServerTemplate
+* @author Lucia Jelinkova
+*
+*/
+@Require(server=(a)Server(type=ServerType.JbossAS, version="5.1", state=ServerState.Present))
+public class CreateAS5Server extends CreateServerTemplate {
+
+ @Override
+ protected void assertEditorPorts() {
+ assertThat("8080", is(editor.getWebPort()));
+ assertThat("1099", is(editor.getJNDIPort()));
+ }
+
+ @Override
+ protected void assertViewPorts(List<XMLConfiguration> configurations) {
+ for (XMLConfiguration config : configurations){
+ assertValueIsNumber(config);
+ }
+ }
+
+ private void assertValueIsNumber(XMLConfiguration config){
+ try {
+ Integer.parseInt(config.getValue());
+ } catch (NumberFormatException e){
+ fail(config + " does not a numeric value");
+ }
+ }
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/DeployJSPProjectAS5Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/DeployJSPProjectAS5Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/DeployJSPProjectAS5Server.java 2012-07-27 16:07:57 UTC (rev 42767)
@@ -0,0 +1,21 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as5;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeployJSPProjectTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+
+/**
+ * @see DeployJSPProjectTemplate
+ * @author Lucia Jelinkova
+ *
+ */
+@Require(server=(a)Server(type=ServerType.JbossAS, version="5.1", state=ServerState.Running))
+public class DeployJSPProjectAS5Server extends DeployJSPProjectTemplate {
+
+ @Override
+ protected String getConsoleMessage() {
+ return "deploy, ctxPath=/" + PROJECT_NAME;
+ }
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/OperateAS5Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/OperateAS5Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/OperateAS5Server.java 2012-07-27 16:07:57 UTC (rev 42767)
@@ -0,0 +1,21 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as5;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.OperateServerTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+
+/**
+ * @see OperateServerTemplate
+ * @author Lucia Jelinkova
+ *
+ */
+@Require(server=(a)Server(type=ServerType.JbossAS, version="5.1", state=ServerState.NotRunning))
+public class OperateAS5Server extends OperateServerTemplate {
+
+ @Override
+ public String getWelcomePageText() {
+ return "Manage this JBoss AS Instance";
+ }
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/UndeployJSPProjectAS5Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/UndeployJSPProjectAS5Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/UndeployJSPProjectAS5Server.java 2012-07-27 16:07:57 UTC (rev 42767)
@@ -0,0 +1,22 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as5;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeployJSPProjectTemplate;
+import org.jboss.ide.eclipse.as.ui.bot.test.template.UndeployJSPProjectTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+
+/**
+ * @see UndeployJSPProjectTemplate
+ * @author Lucia Jelinkova
+ *
+ */
+@Require(server=(a)Server(type=ServerType.JbossAS, version="5.1", state=ServerState.Running), clearProjects=false, clearWorkspace=false)
+public class UndeployJSPProjectAS5Server extends UndeployJSPProjectTemplate {
+
+ @Override
+ protected String getConsoleMessage() {
+ return "undeploy, ctxPath=/" + DeployJSPProjectTemplate.PROJECT_NAME;
+ }
+}
Deleted: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/HotDeployJSPFile.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/HotDeployJSPFile.java 2012-07-27 15:58:11 UTC (rev 42766)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/HotDeployJSPFile.java 2012-07-27 16:07:57 UTC (rev 42767)
@@ -1,36 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as7;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-
-import org.jboss.ide.eclipse.as.ui.bot.test.web.PageSourceMatcher;
-import org.jboss.ide.eclipse.as.ui.bot.test.wizard.NewFileWizard;
-import org.jboss.tools.ui.bot.ext.SWTBotFactory;
-import org.jboss.tools.ui.bot.ext.SWTTestExt;
-import org.junit.Test;
-
-/**
- * Adds a new jsp file into the jsp project and checks it is hot deployed:
- * <ul>
- * <li>loads the new page in the web browser </li>
- * </ul>
- * @author Lucia Jelinkova
- *
- */
-public class HotDeployJSPFile extends SWTTestExt {
-
- public static final String JSP_CONTENT =
- "<%@ page language=\"java\" contentType=\"text/html; charset=UTF-8\" pageEncoding=\"UTF-8\"%> \n" +
- "<html> <body> Hot deployment </body> </html>";
-
- @Test
- public void hotDeployment(){
- NewFileWizard wizard = new NewFileWizard();
- wizard.setPath(DeployJSPProjectAS7Server.PROJECT_NAME, "WebContent");
- wizard.setFileName("hot.jsp");
- wizard.setText(JSP_CONTENT);
- wizard.execute();
-
- SWTBotFactory.getBot().sleep(5000);
- assertThat("Hot deployment", new PageSourceMatcher("http://localhost:8080/" + DeployJSPProjectAS7Server.PROJECT_NAME + "/hot.jsp"));
- }
-}
Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/HotDeployJSPFile.java (from rev 42760, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/HotDeployJSPFile.java)
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/HotDeployJSPFile.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/HotDeployJSPFile.java 2012-07-27 16:07:57 UTC (rev 42767)
@@ -0,0 +1,37 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.template;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.as7.DeployJSPProjectAS7Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.web.PageSourceMatcher;
+import org.jboss.ide.eclipse.as.ui.bot.test.wizard.NewFileWizard;
+import org.jboss.tools.ui.bot.ext.SWTBotFactory;
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.junit.Test;
+
+/**
+ * Adds a new jsp file into the jsp project and checks it is hot deployed:
+ * <ul>
+ * <li>loads the new page in the web browser </li>
+ * </ul>
+ * @author Lucia Jelinkova
+ *
+ */
+public class HotDeployJSPFile extends SWTTestExt {
+
+ public static final String JSP_CONTENT =
+ "<%@ page language=\"java\" contentType=\"text/html; charset=UTF-8\" pageEncoding=\"UTF-8\"%> \n" +
+ "<html> <body> Hot deployment </body> </html>";
+
+ @Test
+ public void hotDeployment(){
+ NewFileWizard wizard = new NewFileWizard();
+ wizard.setPath(DeployJSPProjectAS7Server.PROJECT_NAME, "WebContent");
+ wizard.setFileName("hot.jsp");
+ wizard.setText(JSP_CONTENT);
+ wizard.execute();
+
+ SWTBotFactory.getBot().sleep(5000);
+ assertThat("Hot deployment", new PageSourceMatcher("http://localhost:8080/" + DeployJSPProjectAS7Server.PROJECT_NAME + "/hot.jsp"));
+ }
+}
13 years, 2 months
JBoss Tools SVN: r42766 - trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-07-27 11:58:11 -0400 (Fri, 27 Jul 2012)
New Revision: 42766
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.project.facet.core.xml
Log:
Changed facet version in testing project
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.project.facet.core.xml 2012-07-27 15:21:47 UTC (rev 42765)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.project.facet.core.xml 2012-07-27 15:58:11 UTC (rev 42766)
@@ -4,6 +4,6 @@
<fixed facet="java"/>
<fixed facet="wst.jsdt.web"/>
<installed facet="java" version="1.6"/>
- <installed facet="jst.web" version="3.0"/>
<installed facet="wst.jsdt.web" version="1.0"/>
+ <installed facet="jst.web" version="2.5"/>
</faceted-project>
13 years, 2 months
JBoss Tools SVN: r42765 - trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-07-27 11:21:47 -0400 (Fri, 27 Jul 2012)
New Revision: 42765
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/
Log:
Ignoring generated files
Property changes on: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources
___________________________________________________________________
Added: svn:ignore
+ generated_config_files
13 years, 2 months
JBoss Tools SVN: r42764 - trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-07-27 11:20:42 -0400 (Fri, 27 Jul 2012)
New Revision: 42764
Removed:
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/eap-6.properties
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/jbossas-6.properties
Log:
Added support for preparing workspace using launcher
Deleted: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/eap-6.properties
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/eap-6.properties 2012-07-27 15:20:16 UTC (rev 42763)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/eap-6.properties 2012-07-27 15:20:42 UTC (rev 42764)
@@ -1 +0,0 @@
-SERVER=EAP,6.0,default,/home/ljelinko/programs/jboss/EAP/jboss-eap-6.0
Deleted: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/jbossas-6.properties
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/jbossas-6.properties 2012-07-27 15:20:16 UTC (rev 42763)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/jbossas-6.properties 2012-07-27 15:20:42 UTC (rev 42764)
@@ -1 +0,0 @@
-SERVER=AS,6.1,default,/home/ljelinko/programs/jboss/AS/jboss-6.1.0.Final
13 years, 2 months
JBoss Tools SVN: r42763 - in trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test: launchers/prepare_workspace and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-07-27 11:20:16 -0400 (Fri, 27 Jul 2012)
New Revision: 42763
Added:
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/as_portlets_prepare_workspace.launch
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/pom.xml
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/product/
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/product/eap-6.properties
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-5.properties
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-6.properties
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite.launch
Log:
Added support for preparing workspace using launcher
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite.launch
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite.launch 2012-07-27 14:24:16 UTC (rev 42762)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite.launch 2012-07-27 15:20:16 UTC (rev 42763)
@@ -30,7 +30,7 @@
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.ide.eclipse.as.ui.bot.test"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dswtbot.test.properties.file=${file_prompt:"Please choose a SWTBot configuration file":${workspace_loc}/org.jboss.ide.eclipse.as.ui.bot.test/resources/} -Xmx1024m -XX:MaxPermSize=256m"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dswtbot.test.properties.file=${file_prompt:"Please choose a SWTBot configuration file":${workspace_loc}/org.jboss.ide.eclipse.as.ui.bot.test/resources/generated_config_files} -Xmx1024m -XX:MaxPermSize=256m"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.platform.ide"/>
<booleanAttribute key="show_selected_only" value="false"/>
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/as_portlets_prepare_workspace.launch
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/as_portlets_prepare_workspace.launch (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/as_portlets_prepare_workspace.launch 2012-07-27 15:20:16 UTC (rev 42763)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
+<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
+<stringAttribute key="M2_GOALS" value="clean process-resources"/>
+<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
+<booleanAttribute key="M2_OFFLINE" value="false"/>
+<stringAttribute key="M2_PROFILES" value=""/>
+<listAttribute key="M2_PROPERTIES">
+<listEntry value="eap-6.0=${folder_prompt:EAP 6.0 installation directory}"/>
+<listEntry value="jboss-as-5.1=${folder_prompt:JBoss AS 5.1 installation directory}"/>
+<listEntry value="jboss-as-6.1=${folder_prompt:JBoss AS 6.1 installation directory}"/>
+</listAttribute>
+<stringAttribute key="M2_RUNTIME" value="/home/ljelinko/programs/apache-maven-3.0.3"/>
+<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
+<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
+<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace}"/>
+</launchConfiguration>
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/pom.xml
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/pom.xml (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/pom.xml 2012-07-27 15:20:16 UTC (rev 42763)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <groupId>org.jboss.ide.eclipse.as.ui.bot.test</groupId>
+ <artifactId>prepare.workspace</artifactId>
+ <version>0.0.0-SNAPSHOT</version>
+ <modelVersion>4.0.0</modelVersion>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>../../resources/config_files_templates/product</directory>
+ <filtering>true</filtering>
+ </resource>
+ <resource>
+ <directory>../../resources/config_files_templates/project</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
+ <outputDirectory>../../resources/generated_config_files</outputDirectory>
+ </build>
+</project>
\ No newline at end of file
Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/product/eap-6.properties (from rev 41882, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/eap-6.properties)
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/product/eap-6.properties (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/product/eap-6.properties 2012-07-27 15:20:16 UTC (rev 42763)
@@ -0,0 +1 @@
+SERVER=EAP,6.0,default,${eap-6.0}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-5.properties
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-5.properties (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-5.properties 2012-07-27 15:20:16 UTC (rev 42763)
@@ -0,0 +1 @@
+SERVER=AS,5.1,default,${jboss-as-5.1}
Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-6.properties (from rev 42760, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/jbossas-6.properties)
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-6.properties (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-6.properties 2012-07-27 15:20:16 UTC (rev 42763)
@@ -0,0 +1 @@
+SERVER=AS,6.1,default,${jboss-as-6.1}
13 years, 2 months