JBoss Tools SVN: r17250 - in trunk/jst/plugins/org.jboss.tools.jst.web.kb: taglibs and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-08-25 09:04:25 -0400 (Tue, 25 Aug 2009)
New Revision: 17250
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/ResourcePathProposalType.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Ajax4jsf.xml
trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JBossSeam.xml
trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JsfHtmlBasic.xml
trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Richfaces.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-4822 fixed
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/ResourcePathProposalType.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/ResourcePathProposalType.java 2009-08-25 12:10:36 UTC (rev 17249)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/ResourcePathProposalType.java 2009-08-25 13:04:25 UTC (rev 17250)
@@ -51,9 +51,11 @@
PAGE_FILE_EXTENSIONS.add(pages[i]);
}
}
+ private static String PATH_ADDITION = "pathAddition";
private IContainer webRootResource;
private Set<String> extensions;
+ private List<String> enumeration;
/* (non-Javadoc)
* @see org.jboss.tools.jst.web.kb.internal.taglib.ModelProposalType#init(org.jboss.tools.jst.web.kb.IPageContext)
@@ -71,6 +73,16 @@
if(extensions==null) {
initExtensions();
}
+ if(enumeration==null) {
+ enumeration = new ArrayList<String>();
+ if(params!=null) {
+ for (int i = 0; i < params.length; i++) {
+ if(PATH_ADDITION.equals(params[i].getName())) {
+ enumeration.add(params[i].getValue());
+ }
+ }
+ }
+ }
}
/* (non-Javadoc)
@@ -99,6 +111,19 @@
proposal.setImage(ICON);
proposals.add(proposal);
}
+ for (String path : enumeration) {
+ TextProposal proposal = new TextProposal();
+ proposal.setLabel(path);
+ String replacementString = path;
+ proposal.setAutoActivationContentAssistantAfterApplication(false);
+ proposal.setReplacementString(replacementString);
+ proposal.setPosition(replacementString.length());
+ if(ICON==null) {
+ ICON = ImageDescriptor.createFromFile(WebKbPlugin.class, IMAGE_NAME).createImage();
+ }
+ proposal.setImage(ICON);
+ proposals.add(proposal);
+ }
return proposals.toArray(new TextProposal[0]);
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Ajax4jsf.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Ajax4jsf.xml 2009-08-25 12:10:36 UTC (rev 17249)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Ajax4jsf.xml 2009-08-25 13:04:25 UTC (rev 17250)
@@ -1,7 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE tag-lib PUBLIC "-//Red Hat, Inc//DTD Knowledge Base 2.0//EN" "http://anonsvn.jboss.org/repos/jbosstools/trunk/jst/plugins/org.jboss.too...">
<tag-lib defaultPrefix="a4j">
- <custom-extension>
+ <component-extension>
+ <attribute name="focus">
+ <proposal type="id"/>
+ </attribute>
+ <attribute name="reRender">
+ <proposal type="id"/>
+ </attribute>
+ <attribute name="status">
+ <proposal type="id"/>
+ </attribute>
+ <attribute name="for">
+ <proposal type="id"/>
+ </attribute>
+ <attribute name="targetId">
+ <proposal type="id"/>
+ </attribute>
+ <attribute name="panelId">
+ <proposal type="id"/>
+ </attribute>
+ <attribute name="dragIndicator">
+ <proposal type="id"/>
+ </attribute>
+ <attribute name="process">
+ <proposal type="id"/>
+ </attribute>
+ <attribute name="similarityGroupingId">
+ <proposal type="id"/>
+ </attribute>
+ <attribute name="reRenderAfterComplete">
+ <proposal type="id"/>
+ </attribute>
+ <attribute name="attachTo">
+ <proposal type="id"/>
+ </attribute>
<attribute name="ajaxSingle">
<proposal type="enumeration">
<param value="true" />
@@ -38,7 +71,7 @@
<param value="false" />
</proposal>
</attribute>
- </custom-extension>
+ </component-extension>
<component closeTag="true" name="loadBundle">
<attribute name="basename">
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JBossSeam.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JBossSeam.xml 2009-08-25 12:10:36 UTC (rev 17249)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JBossSeam.xml 2009-08-25 13:04:25 UTC (rev 17250)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE tag-lib PUBLIC "-//Red Hat, Inc//DTD Knowledge Base 2.0//EN" "http://anonsvn.jboss.org/repos/jbosstools/trunk/jst/plugins/org.jboss.too...">
<tag-lib defaultPrefix="s">
- <custom-extension>
+ <component-extension>
<attribute name="propagation">
<proposal type="enumeration">
<param value="begin" />
@@ -11,7 +11,7 @@
<param value="end" />
</proposal>
</attribute>
- </custom-extension>
+ </component-extension>
<component name="button">
<attribute name="view">
<proposal type="file">
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JsfHtmlBasic.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JsfHtmlBasic.xml 2009-08-25 12:10:36 UTC (rev 17249)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JsfHtmlBasic.xml 2009-08-25 13:04:25 UTC (rev 17250)
@@ -8,8 +8,8 @@
<proposal type="file">
<param name="extensions" value="%image%" />
<param name="pathType" value="absolute" />
- <param name="pathAddition"
- value="#{facesContext.externalContext.requestContextPath}" />
+ <!-- param name="pathAddition"
+ value="#{facesContext.externalContext.requestContextPath}" / -->
</proposal>
</attribute>
<attribute name="type">
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Richfaces.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Richfaces.xml 2009-08-25 12:10:36 UTC (rev 17249)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Richfaces.xml 2009-08-25 13:04:25 UTC (rev 17250)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE tag-lib PUBLIC "-//Red Hat, Inc//DTD Knowledge Base 2.0//EN" "http://anonsvn.jboss.org/repos/jbosstools/trunk/jst/plugins/org.jboss.too...">
<tag-lib defaultPrefix="rich">
- <custom-extension>
+ <component-extension>
<attribute name="focus">
<proposal type="id"/>
</attribute>
@@ -71,7 +71,7 @@
<param value="false" />
</proposal>
</attribute>
- </custom-extension>
+ </component-extension>
<component name="extendedDataTable">
<attribute name="align">
16 years, 7 months
- 1
- 0
JBoss Tools SVN: r17249 - in workspace/snjeza/booking-mavenized/booking: src and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2009-08-25 08:10:36 -0400 (Tue, 25 Aug 2009)
New Revision: 17249
Added:
workspace/snjeza/booking-mavenized/booking/src/main/resources/
Removed:
workspace/snjeza/booking-mavenized/booking/src/resources/
Modified:
workspace/snjeza/booking-mavenized/booking/pom.xml
Log:
Modified: workspace/snjeza/booking-mavenized/booking/pom.xml
===================================================================
--- workspace/snjeza/booking-mavenized/booking/pom.xml 2009-08-25 08:52:19 UTC (rev 17248)
+++ workspace/snjeza/booking-mavenized/booking/pom.xml 2009-08-25 12:10:36 UTC (rev 17249)
@@ -151,7 +151,7 @@
<outputDirectory>${basedir}/src/main/webapp/WEB-INF/classes</outputDirectory>
<resources>
<resource>
- <directory>${basedir}/src/resources</directory>
+ <directory>${basedir}/src/main/resources</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
Copied: workspace/snjeza/booking-mavenized/booking/src/main/resources (from rev 17232, workspace/snjeza/booking-mavenized/booking/src/resources)
16 years, 7 months
- 1
- 0
JBoss Tools SVN: r17248 - in trunk/esb/plugins/org.jboss.tools.esb.project.core: META-INF and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2009-08-25 04:52:19 -0400 (Tue, 25 Aug 2009)
New Revision: 17248
Removed:
trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/component/
Modified:
trunk/esb/plugins/org.jboss.tools.esb.project.core/META-INF/MANIFEST.MF
trunk/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml
trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/ESBProjectConstant.java
trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/IJBossESBFacetDataModelProperties.java
trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossESBFacetInstallationDelegate.java
trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleDelegate.java
trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleFactory.java
Log:
revert the commit below:
JBIDE-4654:JBossESBFacetInstallationDelegate adds incorrect mapping
JBIDE-4320:ESB Projects does not respect WTP module dependency rules
apply the patches attached in the jiras above
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/META-INF/MANIFEST.MF 2009-08-25 06:44:12 UTC (rev 17247)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/META-INF/MANIFEST.MF 2009-08-25 08:52:19 UTC (rev 17248)
@@ -29,8 +29,7 @@
org.eclipse.jem.util,
org.eclipse.wst.common.emfworkbench.integration,
org.eclipse.emf.ecore,
- org.jboss.ide.eclipse.as.classpath.core,
- org.jboss.ide.eclipse.as.wtp.core;bundle-version="1.0.0"
+ org.jboss.ide.eclipse.as.classpath.core
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %providerName
Export-Package: org.jboss.tools.esb.core,
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml 2009-08-25 06:44:12 UTC (rev 17247)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml 2009-08-25 08:52:19 UTC (rev 17248)
@@ -209,14 +209,4 @@
containerID="org.jboss.esb.runtime.classpath">
</filteredClasspathContainer>
</extension>
-
-
- <extension
- point="org.eclipse.wst.common.modulecore.componentimpl">
- <componentimpl
- typeID="jst.jboss.esb"
- class="org.jboss.tools.esb.core.component.ESBVirtualComponent">
- </componentimpl>
- </extension>
-
</plugin>
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/ESBProjectConstant.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/ESBProjectConstant.java 2009-08-25 06:44:12 UTC (rev 17247)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/ESBProjectConstant.java 2009-08-25 08:52:19 UTC (rev 17248)
@@ -16,8 +16,6 @@
public final static String ESB_PROJECT_FACET_TEMPLATE = "template.jst.jboss.esb";
public final static String BUILD_CLASSES = "build/classes";
public final static String META_INF = "META-INF";
- public final static String ESB_CLASS = ""; //put ESB classes into the root of ESB archive
- public final static String ESB_INF_LIB = "lib";
public final static String ESB_CONFIG_JBOSSESB = "jboss-esb.xml";
public final static String ESB_CONFIG_DEPLOYMENT = "deployment.xml";
@@ -26,7 +24,6 @@
public final static String DEFAULT_ESB_CONFIG_RESOURCE_FOLDER = "esbcontent";
public final static String DEFAULT_ESB_SOURCE_FOLDER = "src";
- public final static String CONTEXTROOT = "context-root";
public final static String ESB_PROJECT_NATURE = "org.jboss.tools.esb.project.ESBNature";
}
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/IJBossESBFacetDataModelProperties.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/IJBossESBFacetDataModelProperties.java 2009-08-25 06:44:12 UTC (rev 17247)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/IJBossESBFacetDataModelProperties.java 2009-08-25 08:52:19 UTC (rev 17248)
@@ -27,7 +27,6 @@
public static final QualifiedName QNAME_ESB_CONTENT_FOLDER = new QualifiedName("jboss", ESB_CONTENT_FOLDER);
public static final QualifiedName QNAME_ESB_SRC_FOLDER = new QualifiedName("jboss", ESB_SOURCE_FOLDER);
- public static final String ESB_PROJECT_VERSION = "jboss.esb.project.project.version";
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossESBFacetInstallationDelegate.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossESBFacetInstallationDelegate.java 2009-08-25 06:44:12 UTC (rev 17247)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossESBFacetInstallationDelegate.java 2009-08-25 08:52:19 UTC (rev 17248)
@@ -11,6 +11,7 @@
package org.jboss.tools.esb.core.facet;
import java.io.ByteArrayInputStream;
+import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import org.eclipse.core.resources.IFile;
@@ -18,14 +19,11 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IProjectDescription;
import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ProjectScope;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.IScopeContext;
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
@@ -37,7 +35,6 @@
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.project.facet.core.IDelegate;
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.jboss.tools.esb.core.ESBProjectCorePlugin;
public class JBossESBFacetInstallationDelegate implements IDelegate {
@@ -48,11 +45,12 @@
public void execute(IProject project, IProjectFacetVersion fv,
Object config, IProgressMonitor monitor) throws CoreException {
model = (IDataModel) config;
- final IJavaProject jproj = JavaCore.create(project);
createProjectStructure(project);
+
+
+ final IJavaProject jproj = JavaCore.create(project);
-
// Add WTP natures.
WtpUtils.addNatures(project);
@@ -64,26 +62,31 @@
} catch (Exception e) {
c = ComponentCore.createComponent(project);
}
-
- String outputLoc = jproj.readOutputLocation().removeFirstSegments(1).toString();
+
+
c.create(0, null);
- c.setMetaProperty("java-output-path", outputLoc);
+ //String esbContent = model.getStringProperty(IJBossESBFacetDataModelProperties.ESB_CONTENT_FOLDER);
+ c.setMetaProperty("java-output-path", "/build/classes/");
final IVirtualFolder jbiRoot = c.getRootFolder();
- // Map the esbcontent to root for deploy
- String resourcesFolder = model.getStringProperty(
- IJBossESBFacetDataModelProperties.ESB_CONTENT_FOLDER);
+ // Create directory structure
+ /*String srcFolder = null;
+ srcFolder = model
+ .getStringProperty(IJBossESBFacetDataModelProperties.ESB_SOURCE_FOLDER);
+ jbiRoot.createLink(new Path("/" + srcFolder), 0, null);*/
+ String resourcesFolder = model
+ .getStringProperty(IJBossESBFacetDataModelProperties.ESB_CONTENT_FOLDER);
jbiRoot.createLink(new Path("/" + resourcesFolder), 0, null);
- final IVirtualFolder jsrc = c.getRootFolder().getFolder("/"); //$NON-NLS-1$
- final IClasspathEntry[] cp2 = jproj.getRawClasspath();
- for (int i = 0; i < cp2.length; i++) {
- final IClasspathEntry cpe = cp2[i];
+ final IVirtualFolder jsrc = c.getRootFolder().getFolder("/esbcontent"); //$NON-NLS-1$
+ final IClasspathEntry[] cp = jproj.getRawClasspath();
+ for (int i = 0; i < cp.length; i++) {
+ final IClasspathEntry cpe = cp[i];
if (cpe.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
if( cpe.getPath().removeFirstSegments(1).segmentCount() > 0 )
- jsrc.createLink(new Path(outputLoc), 0, null);
+ jsrc.createLink(cpe.getPath().removeFirstSegments(1), 0, null);
}
}
@@ -99,6 +102,11 @@
ClasspathHelper.removeClasspathEntries(project, fv);
ClasspathHelper.addClasspathEntries(project, fv);
+
+ //String prjName = model.getStringProperty(IFacetDataModelProperties.FACET_PROJECT_NAME);
+ //IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(prjName);
+
+
}
private IFile createJBossESBXML(IFolder folder) throws CoreException{
@@ -118,13 +126,6 @@
private void createProjectStructure(IProject project) throws CoreException{
String strContentFolder = model.getStringProperty(IJBossESBFacetDataModelProperties.ESB_CONTENT_FOLDER);
project.setPersistentProperty(IJBossESBFacetDataModelProperties.QNAME_ESB_CONTENT_FOLDER, strContentFolder);
-
- String qualifier = ESBProjectCorePlugin.getDefault().getDescriptor().getUniqueIdentifier();
- IScopeContext context = new ProjectScope(project);
- IEclipsePreferences node = context.getNode(qualifier);
- if (node != null)
- node.putDouble(IJBossESBFacetDataModelProperties.ESB_PROJECT_VERSION, 2.0);
-
IFolder esbContent = project.getFolder(strContentFolder);
if(!esbContent.exists()) {
esbContent.create(true, true, null);
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleDelegate.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleDelegate.java 2009-08-25 06:44:12 UTC (rev 17247)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleDelegate.java 2009-08-25 08:52:19 UTC (rev 17248)
@@ -14,51 +14,41 @@
import java.util.List;
import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ProjectScope;
+import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.IScopeContext;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.wst.common.componentcore.ComponentCore;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
+import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.model.IModuleResource;
-import org.jboss.ide.eclipse.as.wtp.core.modules.IJBTModule;
-import org.jboss.ide.eclipse.as.wtp.core.modules.JBTProjectModuleDelegate;
-import org.jboss.tools.esb.core.ESBProjectCorePlugin;
+import org.eclipse.wst.server.core.util.ModuleFile;
+import org.eclipse.wst.server.core.util.ModuleFolder;
+import org.eclipse.wst.server.core.util.ProjectModule;
import org.jboss.tools.esb.core.StatusUtils;
-import org.jboss.tools.esb.core.facet.IJBossESBFacetDataModelProperties;
-public class JBossESBModuleDelegate extends JBTProjectModuleDelegate implements IJBTModule {
+public class JBossESBModuleDelegate extends ProjectModule {
public JBossESBModuleDelegate(IProject project){
super(project);
}
+ @Override
+ public IModule[] getChildModules() {
+ return null;
+ }
public IModuleResource[] members() throws CoreException {
- IProject p = getProject();
- String qualifier = ESBProjectCorePlugin.getDefault().getDescriptor().getUniqueIdentifier();
- IScopeContext context = new ProjectScope(p);
- IEclipsePreferences node = context.getNode(qualifier);
- if (node != null) {
- double d = node.getDouble(IJBossESBFacetDataModelProperties.ESB_PROJECT_VERSION, 1.0);
- if( d >= 2.0 )
- return super.members();
- }
- return legacyMembers();
- }
-
- public IModuleResource[] legacyMembers() throws CoreException {
IProject project = getProject();
final IVirtualComponent c = ComponentCore.createComponent(project);
IVirtualFolder vf = c.getRootFolder();
IContainer[] folders = vf.getUnderlyingFolders();
-
if(folders == null || folders.length == 0){
throw new CoreException(StatusUtils.errorStatus("The project is not a valid JBoss ESB project."));
}
@@ -67,8 +57,8 @@
//in the JBT CR1, the length of folders will be 1.
IContainer contentFolder = folders.length > 1? folders[1] : folders[0];
- IFolder configFolder = getProject().getFolder(contentFolder.getProjectRelativePath());
- IJavaProject javaPrj = JavaCore.create(getProject());
+ IFolder configFolder = project.getFolder(contentFolder.getProjectRelativePath());
+ IJavaProject javaPrj = JavaCore.create(project);
IPath output = javaPrj.getOutputLocation();
// if the jboss-esb.xml file is not in META-INF folder, try to get it from other folder of the project
// block this logic as Max's suggestion
@@ -77,7 +67,7 @@
List<IModuleResource> mrs = new ArrayList<IModuleResource>();
IModuleResource[] esbContent = getModuleResources(Path.EMPTY, configFolder);
- IModuleResource[] classes = getModuleResources(Path.EMPTY, getProject().getWorkspace().getRoot().getFolder(output));
+ IModuleResource[] classes = getModuleResources(Path.EMPTY, project.getWorkspace().getRoot().getFolder(output));
IModuleResource[] allResource = new IModuleResource[esbContent.length + classes.length + mrs.size()];
System.arraycopy(esbContent, 0, allResource, 0, esbContent.length);
System.arraycopy(classes, 0, allResource, esbContent.length, classes.length);
@@ -87,9 +77,40 @@
}
return allResource;
}
+
+
+
+ @Override
+ public IStatus validate() {
+ return null;
+ }
@Override
- protected String getFactoryId() {
- return JBossESBModuleFactory.FACTORY_ID;
+ protected IModuleResource[] getModuleResources(IPath path, IContainer container) throws CoreException {
+
+ IResource[] resources = container.members();
+ if (resources != null) {
+ int size = resources.length;
+ List<IModuleResource> list = new ArrayList<IModuleResource>(size);
+ for (int i = 0; i < size; i++) {
+ IResource resource = resources[i];
+ if (resource != null && resource.exists()) {
+ String name = resource.getName();
+ if (resource instanceof IContainer) {
+ IContainer container2 = (IContainer) resource;
+ ModuleFolder mf = new ModuleFolder(container2, name, path);
+ mf.setMembers(getModuleResources(path.append(name), container2));
+ list.add(mf);
+ } else if (resource instanceof IFile) {
+ list.add(new ModuleFile((IFile) resource, name, path));
+ }
+ }
+ }
+ IModuleResource[] moduleResources = new IModuleResource[list.size()];
+ list.toArray(moduleResources);
+ return moduleResources;
+ }
+ return new IModuleResource[0];
}
+
}
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleFactory.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleFactory.java 2009-08-25 06:44:12 UTC (rev 17247)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleFactory.java 2009-08-25 08:52:19 UTC (rev 17248)
@@ -10,29 +10,92 @@
******************************************************************************/
package org.jboss.tools.esb.core.module;
+import java.util.HashMap;
+
import org.eclipse.core.resources.IProject;
-import org.jboss.ide.eclipse.as.wtp.core.modules.JBTProjectModuleDelegate;
-import org.jboss.ide.eclipse.as.wtp.core.modules.JBTProjectModuleFactory;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.wst.common.project.facet.core.IFacetedProject;
+import org.eclipse.wst.common.project.facet.core.IProjectFacet;
+import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
+import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.internal.ModuleFactory;
+import org.eclipse.wst.server.core.internal.ServerPlugin;
+import org.eclipse.wst.server.core.model.ModuleDelegate;
+import org.eclipse.wst.server.core.util.ProjectModuleFactoryDelegate;
import org.jboss.tools.esb.core.ESBProjectConstant;
+import org.jboss.tools.esb.core.ESBProjectCorePlugin;
import org.jboss.tools.esb.core.facet.IJBossESBFacetDataModelProperties;
-public class JBossESBModuleFactory extends JBTProjectModuleFactory {
+public class JBossESBModuleFactory extends ProjectModuleFactoryDelegate {
public static final String FACTORY_ID = "org.jboss.tools.esb.project.core.moduleFactory";
public static final String MODULE_TYPE = IJBossESBFacetDataModelProperties.JBOSS_ESB_FACET_ID;
+ public static final String MODULE_ID_PREFIX = IJBossESBFacetDataModelProperties.JBOSS_ESB_FACET_ID + ".";
+ private static ModuleFactory factory;
private static JBossESBModuleFactory factDelegate;
public static JBossESBModuleFactory getFactory() {
- if (factDelegate == null)
- factDelegate = (JBossESBModuleFactory)getFactory(FACTORY_ID);
+ if (factDelegate == null) {
+ ModuleFactory[] factories = ServerPlugin.getModuleFactories();
+ for (int i = 0; i < factories.length; i++) {
+ if (factories[i].getId().equals(FACTORY_ID)) {
+ Object o = factories[i]
+ .getDelegate(new NullProgressMonitor());
+ if (o instanceof JBossESBModuleFactory) {
+ factory = factories[i];
+ factDelegate = (JBossESBModuleFactory) o;
+ return factDelegate;
+ }
+ }
+ }
+ }
return factDelegate;
}
+
+ private HashMap<IModule, JBossESBModuleDelegate> moduleToDelegate;
public JBossESBModuleFactory() {
- super(MODULE_TYPE, ESBProjectConstant.ESB_PROJECT_FACET);
+ moduleToDelegate = new HashMap<IModule, JBossESBModuleDelegate>();
}
- protected JBTProjectModuleDelegate createDelegate(IProject project) {
- return new JBossESBModuleDelegate(project);
+ @Override
+ protected void clearCache(IProject project) {
+ super.clearCache(project);
+ moduleToDelegate.remove(project);
}
+
+ @Override
+ public ModuleDelegate getModuleDelegate(IModule module) {
+ return moduleToDelegate.get(module);
+ }
+ protected IModule[] createModules(IProject project) {
+ IFacetedProject facetProject;
+ try {
+ facetProject = ProjectFacetsManager.create(project);
+ if (facetProject == null) {
+ return null;
+ }
+ IProjectFacet esbFacet = ProjectFacetsManager
+ .getProjectFacet(ESBProjectConstant.ESB_PROJECT_FACET);
+
+ if (facetProject.hasProjectFacet(esbFacet)) {
+ IProjectFacetVersion version = facetProject.getProjectFacetVersion(esbFacet);
+ IModule module = createModule(
+ MODULE_ID_PREFIX + project.getName(),
+ project.getName(),
+ MODULE_TYPE,
+ version.getVersionString(),
+ project);
+ moduleToDelegate.put(module, new JBossESBModuleDelegate(project));
+ return new IModule[] { module };
+ }
+ } catch (CoreException e) {
+ ESBProjectCorePlugin.getDefault().getLog().log(e.getStatus());
+ }
+ return null;
+
+ }
+
}
16 years, 7 months
- 1
- 0
JBoss Tools SVN: r17247 - in trunk/esb/plugins/org.jboss.tools.esb.project.core: META-INF and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2009-08-25 02:44:12 -0400 (Tue, 25 Aug 2009)
New Revision: 17247
Added:
trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/component/
trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/component/ESBVirtualComponent.java
Modified:
trunk/esb/plugins/org.jboss.tools.esb.project.core/META-INF/MANIFEST.MF
trunk/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml
trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/ESBProjectConstant.java
trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/IJBossESBFacetDataModelProperties.java
trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossESBFacetInstallationDelegate.java
trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleDelegate.java
trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleFactory.java
Log:
JBIDE-4654:JBossESBFacetInstallationDelegate adds incorrect mapping
JBIDE-4320:ESB Projects does not respect WTP module dependency rules
apply the patches attached in the jiras above
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/META-INF/MANIFEST.MF 2009-08-25 06:23:25 UTC (rev 17246)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/META-INF/MANIFEST.MF 2009-08-25 06:44:12 UTC (rev 17247)
@@ -29,7 +29,8 @@
org.eclipse.jem.util,
org.eclipse.wst.common.emfworkbench.integration,
org.eclipse.emf.ecore,
- org.jboss.ide.eclipse.as.classpath.core
+ org.jboss.ide.eclipse.as.classpath.core,
+ org.jboss.ide.eclipse.as.wtp.core;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %providerName
Export-Package: org.jboss.tools.esb.core,
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml 2009-08-25 06:23:25 UTC (rev 17246)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml 2009-08-25 06:44:12 UTC (rev 17247)
@@ -209,4 +209,14 @@
containerID="org.jboss.esb.runtime.classpath">
</filteredClasspathContainer>
</extension>
+
+
+ <extension
+ point="org.eclipse.wst.common.modulecore.componentimpl">
+ <componentimpl
+ typeID="jst.jboss.esb"
+ class="org.jboss.tools.esb.core.component.ESBVirtualComponent">
+ </componentimpl>
+ </extension>
+
</plugin>
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/ESBProjectConstant.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/ESBProjectConstant.java 2009-08-25 06:23:25 UTC (rev 17246)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/ESBProjectConstant.java 2009-08-25 06:44:12 UTC (rev 17247)
@@ -16,6 +16,8 @@
public final static String ESB_PROJECT_FACET_TEMPLATE = "template.jst.jboss.esb";
public final static String BUILD_CLASSES = "build/classes";
public final static String META_INF = "META-INF";
+ public final static String ESB_CLASS = ""; //put ESB classes into the root of ESB archive
+ public final static String ESB_INF_LIB = "lib";
public final static String ESB_CONFIG_JBOSSESB = "jboss-esb.xml";
public final static String ESB_CONFIG_DEPLOYMENT = "deployment.xml";
@@ -24,6 +26,7 @@
public final static String DEFAULT_ESB_CONFIG_RESOURCE_FOLDER = "esbcontent";
public final static String DEFAULT_ESB_SOURCE_FOLDER = "src";
+ public final static String CONTEXTROOT = "context-root";
public final static String ESB_PROJECT_NATURE = "org.jboss.tools.esb.project.ESBNature";
}
Added: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/component/ESBVirtualComponent.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/component/ESBVirtualComponent.java (rev 0)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/component/ESBVirtualComponent.java 2009-08-25 06:44:12 UTC (rev 17247)
@@ -0,0 +1,7 @@
+package org.jboss.tools.esb.core.component;
+
+import org.jboss.ide.eclipse.as.wtp.core.vcf.JBTVirtualComponent;
+
+public class ESBVirtualComponent extends JBTVirtualComponent {
+
+}
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/IJBossESBFacetDataModelProperties.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/IJBossESBFacetDataModelProperties.java 2009-08-25 06:23:25 UTC (rev 17246)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/IJBossESBFacetDataModelProperties.java 2009-08-25 06:44:12 UTC (rev 17247)
@@ -27,6 +27,7 @@
public static final QualifiedName QNAME_ESB_CONTENT_FOLDER = new QualifiedName("jboss", ESB_CONTENT_FOLDER);
public static final QualifiedName QNAME_ESB_SRC_FOLDER = new QualifiedName("jboss", ESB_SOURCE_FOLDER);
+ public static final String ESB_PROJECT_VERSION = "jboss.esb.project.project.version";
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossESBFacetInstallationDelegate.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossESBFacetInstallationDelegate.java 2009-08-25 06:23:25 UTC (rev 17246)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossESBFacetInstallationDelegate.java 2009-08-25 06:44:12 UTC (rev 17247)
@@ -11,7 +11,6 @@
package org.jboss.tools.esb.core.facet;
import java.io.ByteArrayInputStream;
-import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import org.eclipse.core.resources.IFile;
@@ -19,11 +18,14 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IProjectDescription;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ProjectScope;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.core.runtime.preferences.IScopeContext;
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
@@ -35,6 +37,7 @@
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.project.facet.core.IDelegate;
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
+import org.jboss.tools.esb.core.ESBProjectCorePlugin;
public class JBossESBFacetInstallationDelegate implements IDelegate {
@@ -45,12 +48,11 @@
public void execute(IProject project, IProjectFacetVersion fv,
Object config, IProgressMonitor monitor) throws CoreException {
model = (IDataModel) config;
+ final IJavaProject jproj = JavaCore.create(project);
createProjectStructure(project);
-
-
- final IJavaProject jproj = JavaCore.create(project);
+
// Add WTP natures.
WtpUtils.addNatures(project);
@@ -62,31 +64,26 @@
} catch (Exception e) {
c = ComponentCore.createComponent(project);
}
-
-
+
+ String outputLoc = jproj.readOutputLocation().removeFirstSegments(1).toString();
c.create(0, null);
- //String esbContent = model.getStringProperty(IJBossESBFacetDataModelProperties.ESB_CONTENT_FOLDER);
- c.setMetaProperty("java-output-path", "/build/classes/");
+ c.setMetaProperty("java-output-path", outputLoc);
final IVirtualFolder jbiRoot = c.getRootFolder();
- // Create directory structure
- /*String srcFolder = null;
- srcFolder = model
- .getStringProperty(IJBossESBFacetDataModelProperties.ESB_SOURCE_FOLDER);
- jbiRoot.createLink(new Path("/" + srcFolder), 0, null);*/
- String resourcesFolder = model
- .getStringProperty(IJBossESBFacetDataModelProperties.ESB_CONTENT_FOLDER);
+ // Map the esbcontent to root for deploy
+ String resourcesFolder = model.getStringProperty(
+ IJBossESBFacetDataModelProperties.ESB_CONTENT_FOLDER);
jbiRoot.createLink(new Path("/" + resourcesFolder), 0, null);
- final IVirtualFolder jsrc = c.getRootFolder().getFolder("/esbcontent"); //$NON-NLS-1$
- final IClasspathEntry[] cp = jproj.getRawClasspath();
- for (int i = 0; i < cp.length; i++) {
- final IClasspathEntry cpe = cp[i];
+ final IVirtualFolder jsrc = c.getRootFolder().getFolder("/"); //$NON-NLS-1$
+ final IClasspathEntry[] cp2 = jproj.getRawClasspath();
+ for (int i = 0; i < cp2.length; i++) {
+ final IClasspathEntry cpe = cp2[i];
if (cpe.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
if( cpe.getPath().removeFirstSegments(1).segmentCount() > 0 )
- jsrc.createLink(cpe.getPath().removeFirstSegments(1), 0, null);
+ jsrc.createLink(new Path(outputLoc), 0, null);
}
}
@@ -102,11 +99,6 @@
ClasspathHelper.removeClasspathEntries(project, fv);
ClasspathHelper.addClasspathEntries(project, fv);
-
- //String prjName = model.getStringProperty(IFacetDataModelProperties.FACET_PROJECT_NAME);
- //IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(prjName);
-
-
}
private IFile createJBossESBXML(IFolder folder) throws CoreException{
@@ -126,6 +118,13 @@
private void createProjectStructure(IProject project) throws CoreException{
String strContentFolder = model.getStringProperty(IJBossESBFacetDataModelProperties.ESB_CONTENT_FOLDER);
project.setPersistentProperty(IJBossESBFacetDataModelProperties.QNAME_ESB_CONTENT_FOLDER, strContentFolder);
+
+ String qualifier = ESBProjectCorePlugin.getDefault().getDescriptor().getUniqueIdentifier();
+ IScopeContext context = new ProjectScope(project);
+ IEclipsePreferences node = context.getNode(qualifier);
+ if (node != null)
+ node.putDouble(IJBossESBFacetDataModelProperties.ESB_PROJECT_VERSION, 2.0);
+
IFolder esbContent = project.getFolder(strContentFolder);
if(!esbContent.exists()) {
esbContent.create(true, true, null);
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleDelegate.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleDelegate.java 2009-08-25 06:23:25 UTC (rev 17246)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleDelegate.java 2009-08-25 06:44:12 UTC (rev 17247)
@@ -14,41 +14,51 @@
import java.util.List;
import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ProjectScope;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.core.runtime.preferences.IScopeContext;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.wst.common.componentcore.ComponentCore;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.model.IModuleResource;
-import org.eclipse.wst.server.core.util.ModuleFile;
-import org.eclipse.wst.server.core.util.ModuleFolder;
-import org.eclipse.wst.server.core.util.ProjectModule;
+import org.jboss.ide.eclipse.as.wtp.core.modules.IJBTModule;
+import org.jboss.ide.eclipse.as.wtp.core.modules.JBTProjectModuleDelegate;
+import org.jboss.tools.esb.core.ESBProjectCorePlugin;
import org.jboss.tools.esb.core.StatusUtils;
+import org.jboss.tools.esb.core.facet.IJBossESBFacetDataModelProperties;
-public class JBossESBModuleDelegate extends ProjectModule {
+public class JBossESBModuleDelegate extends JBTProjectModuleDelegate implements IJBTModule {
public JBossESBModuleDelegate(IProject project){
super(project);
}
- @Override
- public IModule[] getChildModules() {
- return null;
- }
public IModuleResource[] members() throws CoreException {
+ IProject p = getProject();
+ String qualifier = ESBProjectCorePlugin.getDefault().getDescriptor().getUniqueIdentifier();
+ IScopeContext context = new ProjectScope(p);
+ IEclipsePreferences node = context.getNode(qualifier);
+ if (node != null) {
+ double d = node.getDouble(IJBossESBFacetDataModelProperties.ESB_PROJECT_VERSION, 1.0);
+ if( d >= 2.0 )
+ return super.members();
+ }
+ return legacyMembers();
+ }
+
+ public IModuleResource[] legacyMembers() throws CoreException {
IProject project = getProject();
final IVirtualComponent c = ComponentCore.createComponent(project);
IVirtualFolder vf = c.getRootFolder();
IContainer[] folders = vf.getUnderlyingFolders();
+
if(folders == null || folders.length == 0){
throw new CoreException(StatusUtils.errorStatus("The project is not a valid JBoss ESB project."));
}
@@ -57,8 +67,8 @@
//in the JBT CR1, the length of folders will be 1.
IContainer contentFolder = folders.length > 1? folders[1] : folders[0];
- IFolder configFolder = project.getFolder(contentFolder.getProjectRelativePath());
- IJavaProject javaPrj = JavaCore.create(project);
+ IFolder configFolder = getProject().getFolder(contentFolder.getProjectRelativePath());
+ IJavaProject javaPrj = JavaCore.create(getProject());
IPath output = javaPrj.getOutputLocation();
// if the jboss-esb.xml file is not in META-INF folder, try to get it from other folder of the project
// block this logic as Max's suggestion
@@ -67,7 +77,7 @@
List<IModuleResource> mrs = new ArrayList<IModuleResource>();
IModuleResource[] esbContent = getModuleResources(Path.EMPTY, configFolder);
- IModuleResource[] classes = getModuleResources(Path.EMPTY, project.getWorkspace().getRoot().getFolder(output));
+ IModuleResource[] classes = getModuleResources(Path.EMPTY, getProject().getWorkspace().getRoot().getFolder(output));
IModuleResource[] allResource = new IModuleResource[esbContent.length + classes.length + mrs.size()];
System.arraycopy(esbContent, 0, allResource, 0, esbContent.length);
System.arraycopy(classes, 0, allResource, esbContent.length, classes.length);
@@ -77,40 +87,9 @@
}
return allResource;
}
-
-
-
- @Override
- public IStatus validate() {
- return null;
- }
@Override
- protected IModuleResource[] getModuleResources(IPath path, IContainer container) throws CoreException {
-
- IResource[] resources = container.members();
- if (resources != null) {
- int size = resources.length;
- List<IModuleResource> list = new ArrayList<IModuleResource>(size);
- for (int i = 0; i < size; i++) {
- IResource resource = resources[i];
- if (resource != null && resource.exists()) {
- String name = resource.getName();
- if (resource instanceof IContainer) {
- IContainer container2 = (IContainer) resource;
- ModuleFolder mf = new ModuleFolder(container2, name, path);
- mf.setMembers(getModuleResources(path.append(name), container2));
- list.add(mf);
- } else if (resource instanceof IFile) {
- list.add(new ModuleFile((IFile) resource, name, path));
- }
- }
- }
- IModuleResource[] moduleResources = new IModuleResource[list.size()];
- list.toArray(moduleResources);
- return moduleResources;
- }
- return new IModuleResource[0];
+ protected String getFactoryId() {
+ return JBossESBModuleFactory.FACTORY_ID;
}
-
}
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleFactory.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleFactory.java 2009-08-25 06:23:25 UTC (rev 17246)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleFactory.java 2009-08-25 06:44:12 UTC (rev 17247)
@@ -10,92 +10,29 @@
******************************************************************************/
package org.jboss.tools.esb.core.module;
-import java.util.HashMap;
-
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.internal.ModuleFactory;
-import org.eclipse.wst.server.core.internal.ServerPlugin;
-import org.eclipse.wst.server.core.model.ModuleDelegate;
-import org.eclipse.wst.server.core.util.ProjectModuleFactoryDelegate;
+import org.jboss.ide.eclipse.as.wtp.core.modules.JBTProjectModuleDelegate;
+import org.jboss.ide.eclipse.as.wtp.core.modules.JBTProjectModuleFactory;
import org.jboss.tools.esb.core.ESBProjectConstant;
-import org.jboss.tools.esb.core.ESBProjectCorePlugin;
import org.jboss.tools.esb.core.facet.IJBossESBFacetDataModelProperties;
-public class JBossESBModuleFactory extends ProjectModuleFactoryDelegate {
+public class JBossESBModuleFactory extends JBTProjectModuleFactory {
public static final String FACTORY_ID = "org.jboss.tools.esb.project.core.moduleFactory";
public static final String MODULE_TYPE = IJBossESBFacetDataModelProperties.JBOSS_ESB_FACET_ID;
- public static final String MODULE_ID_PREFIX = IJBossESBFacetDataModelProperties.JBOSS_ESB_FACET_ID + ".";
- private static ModuleFactory factory;
private static JBossESBModuleFactory factDelegate;
public static JBossESBModuleFactory getFactory() {
- if (factDelegate == null) {
- ModuleFactory[] factories = ServerPlugin.getModuleFactories();
- for (int i = 0; i < factories.length; i++) {
- if (factories[i].getId().equals(FACTORY_ID)) {
- Object o = factories[i]
- .getDelegate(new NullProgressMonitor());
- if (o instanceof JBossESBModuleFactory) {
- factory = factories[i];
- factDelegate = (JBossESBModuleFactory) o;
- return factDelegate;
- }
- }
- }
- }
+ if (factDelegate == null)
+ factDelegate = (JBossESBModuleFactory)getFactory(FACTORY_ID);
return factDelegate;
}
-
- private HashMap<IModule, JBossESBModuleDelegate> moduleToDelegate;
public JBossESBModuleFactory() {
- moduleToDelegate = new HashMap<IModule, JBossESBModuleDelegate>();
+ super(MODULE_TYPE, ESBProjectConstant.ESB_PROJECT_FACET);
}
- @Override
- protected void clearCache(IProject project) {
- super.clearCache(project);
- moduleToDelegate.remove(project);
+ protected JBTProjectModuleDelegate createDelegate(IProject project) {
+ return new JBossESBModuleDelegate(project);
}
-
- @Override
- public ModuleDelegate getModuleDelegate(IModule module) {
- return moduleToDelegate.get(module);
- }
- protected IModule[] createModules(IProject project) {
- IFacetedProject facetProject;
- try {
- facetProject = ProjectFacetsManager.create(project);
- if (facetProject == null) {
- return null;
- }
- IProjectFacet esbFacet = ProjectFacetsManager
- .getProjectFacet(ESBProjectConstant.ESB_PROJECT_FACET);
-
- if (facetProject.hasProjectFacet(esbFacet)) {
- IProjectFacetVersion version = facetProject.getProjectFacetVersion(esbFacet);
- IModule module = createModule(
- MODULE_ID_PREFIX + project.getName(),
- project.getName(),
- MODULE_TYPE,
- version.getVersionString(),
- project);
- moduleToDelegate.put(module, new JBossESBModuleDelegate(project));
- return new IModule[] { module };
- }
- } catch (CoreException e) {
- ESBProjectCorePlugin.getDefault().getLog().log(e.getStatus());
- }
- return null;
-
- }
-
}
16 years, 7 months
- 1
- 0
JBoss Tools SVN: r17246 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks: graphical/editors/model and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2009-08-25 02:23:25 -0400 (Tue, 25 Aug 2009)
New Revision: 17246
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavaBeanModel.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavaBeanModelFactory.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/JavaBeanChildGraphModel.java
Log:
JBIDE-4648
Fix 2 bugs
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavaBeanModel.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavaBeanModel.java 2009-08-25 03:32:21 UTC (rev 17245)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavaBeanModel.java 2009-08-25 06:23:25 UTC (rev 17246)
@@ -281,12 +281,12 @@
this(beanClass, name, null, null, true);
}
- JavaBeanModel(Class beanClass, boolean lazyLoadProperties) {
+ JavaBeanModel(Class<?> beanClass, boolean lazyLoadProperties) {
this(beanClass, null, null, null, lazyLoadProperties);
}
public boolean isPrimitive() {
- Class beanType = getBeanClass();
+ Class<?> beanType = getBeanClass();
if (beanType == null)
return false;
if (beanType.isPrimitive() || JavaBeanModelFactory.isPrimitiveObject(beanType)) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavaBeanModelFactory.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavaBeanModelFactory.java 2009-08-25 03:32:21 UTC (rev 17245)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavaBeanModelFactory.java 2009-08-25 06:23:25 UTC (rev 17246)
@@ -60,6 +60,7 @@
}
public static boolean isPrimitiveObject(Class<?> clazz) {
+ if(clazz.isEnum()) return true;
return (PRIMITIVE_CLASSES.indexOf(clazz) != -1);
}
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/JavaBeanChildGraphModel.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/JavaBeanChildGraphModel.java 2009-08-25 03:32:21 UTC (rev 17245)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/JavaBeanChildGraphModel.java 2009-08-25 06:23:25 UTC (rev 17246)
@@ -57,6 +57,13 @@
return true;
}
}
+
+ if(sourceModel instanceof IXMLStructuredObject && targetModel instanceof EObject){
+ EStructuralFeature selectorFeature = SmooksUIUtils.getSelectorFeature((EObject)targetModel);
+ if(selectorFeature != null){
+ return true;
+ }
+ }
}
return false;
}
16 years, 7 months
- 1
- 0
JBoss Tools SVN: r17245 - trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-08-24 23:32:21 -0400 (Mon, 24 Aug 2009)
New Revision: 17245
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/plugin.xml
Log:
removing "override" references in id's
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/plugin.xml 2009-08-24 20:44:45 UTC (rev 17244)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/plugin.xml 2009-08-25 03:32:21 UTC (rev 17245)
@@ -12,7 +12,7 @@
objectClass="org.eclipse.core.resources.IProject"
name="Module Assembly"
class="org.jboss.ide.eclipse.as.wtp.ui.propertypage.ModuleAssemblyRootPage"
- id="org.jboss.ide.eclipse.as.wtp.override.ui.J2EEDependenciesPage">
+ id="org.jboss.ide.eclipse.as.wtp.ui.ModuleAssemblyPage">
<enabledWhen>
<and>
<adapt
@@ -26,7 +26,7 @@
point="org.jboss.ide.eclipse.as.wtp.ui.moduleDependencyPropertyPage">
<dependencyPage
class="org.jboss.ide.eclipse.as.wtp.ui.propertypage.impl.EarModuleDependencyPageProvider"
- id="org.jboss.ide.eclipse.as.wtp.override.ui.earDependencyPage">
+ id="org.jboss.ide.eclipse.as.wtp.ui.earDependencyPage">
</dependencyPage>
</extension>
<extension
@@ -34,25 +34,25 @@
<referenceFragment
class="org.jboss.ide.eclipse.as.wtp.ui.propertypage.ProjectReferenceWizardFragment"
icon="icons/prj_obj.gif"
- id="org.jboss.ide.eclipse.as.wtp.override.ui.newProjectReference"
+ id="org.jboss.ide.eclipse.as.wtp.ui.newProjectReference"
name="Project">
</referenceFragment>
<referenceFragment
class="org.jboss.ide.eclipse.as.wtp.ui.propertypage.JarReferenceWizardFragment"
icon="icons/jar_obj.gif"
- id="org.jboss.ide.eclipse.as.wtp.override.ui.jarReference"
+ id="org.jboss.ide.eclipse.as.wtp.ui.jarReference"
name="Jar">
</referenceFragment>
<referenceFragment
class="org.jboss.ide.eclipse.as.wtp.ui.propertypage.ExternalJarReferenceWizardFragment"
icon="icons/jar_obj.gif"
- id="org.jboss.ide.eclipse.as.wtp.override.ui.externalJarReference"
+ id="org.jboss.ide.eclipse.as.wtp.ui.externalJarReference"
name="External Jar">
</referenceFragment>
<referenceFragment
class="org.jboss.ide.eclipse.as.wtp.ui.propertypage.VariableReferenceWizardFragment"
icon="icons/jar_obj.gif"
- id="org.jboss.ide.eclipse.as.wtp.override.ui.variableReference"
+ id="org.jboss.ide.eclipse.as.wtp.ui.variableReference"
name="Variable">
</referenceFragment>
</extension>
16 years, 7 months
- 1
- 0
JBoss Tools SVN: r17244 - in workspace: snjeza/seam-examples and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2009-08-24 16:44:45 -0400 (Mon, 24 Aug 2009)
New Revision: 17244
Modified:
workspace/examples/project-examples-3.0.2.xml
workspace/examples/project-examples-3.1.xml
workspace/snjeza/seam-examples/photoalbum.zip
Log:
https://jira.jboss.org/jira/browse/JBIDE-4594 Add Project Examples that will work with EAP 5.0
Modified: workspace/examples/project-examples-3.0.2.xml
===================================================================
--- workspace/examples/project-examples-3.0.2.xml 2009-08-24 16:39:57 UTC (rev 17243)
+++ workspace/examples/project-examples-3.0.2.xml 2009-08-24 20:44:45 UTC (rev 17244)
@@ -5,7 +5,7 @@
<included-projects>
photoalbum,photoalbum-ear,photoalbum-ejb
</included-projects>
- <shortDescription>PhotoAlbum - EAR (RichFaces 3.3.1.GA, Seam 2.2.0.CR1)</shortDescription>
+ <shortDescription>PhotoAlbum - EAR (RichFaces 3.3.1.GA, Seam 2.2.0.GA)</shortDescription>
<description>This example demonstrates the use of RichFaces components. It includes the photoalbum,photoalbum-ear and photoalbum-ejb projects.
</description>
<size>25833472</size>
Modified: workspace/examples/project-examples-3.1.xml
===================================================================
--- workspace/examples/project-examples-3.1.xml 2009-08-24 16:39:57 UTC (rev 17243)
+++ workspace/examples/project-examples-3.1.xml 2009-08-24 20:44:45 UTC (rev 17244)
@@ -130,7 +130,7 @@
<included-projects>
photoalbum,photoalbum-ear,photoalbum-ejb
</included-projects>
- <shortDescription>PhotoAlbum - EAR (RichFaces 3.3.1.GA, Seam 2.2.0.CR1)</shortDescription>
+ <shortDescription>PhotoAlbum - EAR (RichFaces 3.3.1.GA, Seam 2.2.0.GA)</shortDescription>
<description>This example demonstrates the use of RichFaces components. It includes the photoalbum,photoalbum-ear and photoalbum-ejb projects.
</description>
<size>25833472</size>
Modified: workspace/snjeza/seam-examples/photoalbum.zip
===================================================================
(Binary files differ)
16 years, 7 months
- 1
- 0
JBoss Tools SVN: r17243 - in trunk: jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/4775 and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: sdzmitrovich
Date: 2009-08-24 12:39:57 -0400 (Mon, 24 Aug 2009)
New Revision: 17243
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/4775/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/4775/openOn.css
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/4775/openOnTestPage.html
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnCssClassTest_JBIDE4775.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/OpenOnUtil.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4775
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/4775/openOn.css
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/4775/openOn.css (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/4775/openOn.css 2009-08-24 16:39:57 UTC (rev 17243)
@@ -0,0 +1,3 @@
+.classB {
+ color: blue;
+}
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/4775/openOn.css
___________________________________________________________________
Name: svn:mime-type
+ text/css
Name: svn:eol-style
+ native
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/4775/openOnTestPage.html
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/4775/openOnTestPage.html (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/4775/openOnTestPage.html 2009-08-24 16:39:57 UTC (rev 17243)
@@ -0,0 +1,19 @@
+<html>
+
+<head>
+
+
+<style type="text/css">
+.classA {
+ color: red
+}
+</style>
+<link rel="stylesheet" href="openOn.css" />
+</head>
+
+<body>
+<div class="classA" id="openOn1">Test Page</div>
+<div class="classB" id="openOn2">Test Page</div>
+
+</body>
+</html>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/4775/openOnTestPage.html
___________________________________________________________________
Name: svn:mime-type
+ text/html
Name: svn:eol-style
+ native
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2009-08-24 14:49:12 UTC (rev 17242)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2009-08-24 16:39:57 UTC (rev 17243)
@@ -75,6 +75,7 @@
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide1718Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide2170Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide2362Test;
+import org.jboss.tools.jsf.vpe.jsf.test.jbide.OpenOnCssClassTest_JBIDE4775;
import org.jboss.tools.tests.ImportBean;
import org.jboss.tools.vpe.ui.test.VpeTestSetup;
@@ -159,6 +160,7 @@
suite.addTestSuite(JBIDE4534Test.class);
suite.addTestSuite(JBIDE3247Test.class);
suite.addTestSuite(JBIDE2550Test.class);
+ suite.addTestSuite(OpenOnCssClassTest_JBIDE4775.class);
// $JUnit-END$
// added by Max Areshkau
// add here projects which should be imported for junit tests
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnCssClassTest_JBIDE4775.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnCssClassTest_JBIDE4775.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnCssClassTest_JBIDE4775.java 2009-08-24 16:39:57 UTC (rev 17243)
@@ -0,0 +1,162 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2009 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jsf.vpe.jsf.test.jbide;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr;
+import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.vpe.editor.VpeController;
+import org.jboss.tools.vpe.editor.util.HTML;
+import org.jboss.tools.vpe.ui.test.OpenOnUtil;
+import org.jboss.tools.vpe.ui.test.TestUtil;
+import org.jboss.tools.vpe.ui.test.VpeTest;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.css.CSSStyleRule;
+
+/**
+ * @author Sergey Dzmitrovich
+ *
+ */
+public class OpenOnCssClassTest_JBIDE4775 extends VpeTest {
+
+ private static final String TEST_PAGE_NAME = "JBIDE/4775/openOnTestPage.html"; //$NON-NLS-1$
+
+ private static String ON_PAGE_STYLE_TEST_TAG_ID = "openOn1"; //$NON-NLS-1$
+
+ private static String LINK_STYLE_TEST_TAG_ID = "openOn2"; //$NON-NLS-1$
+
+ private static String CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$
+
+ public OpenOnCssClassTest_JBIDE4775(String name) {
+ super(name);
+ }
+
+ public void testOpenOnStylesOnPage() throws Throwable {
+
+ // wait
+ TestUtil.waitForJobs();
+ // set exception
+ setException(null);
+
+ // get test page path
+ IFile file = (IFile) TestUtil.getComponentPath(TEST_PAGE_NAME,
+ JsfAllTests.IMPORT_PROJECT_NAME);
+
+ assertNotNull("Could not open specified file. componentPage = "
+ + TEST_PAGE_NAME
+ + ";projectName = " + JsfAllTests.IMPORT_PROJECT_NAME, file);//$NON-NLS-1$
+
+ IEditorInput input = new FileEditorInput(file);
+
+ assertNotNull("Editor input is null", input);
+ // open and get editor
+ JSPMultiPageEditor part = openEditor(input);
+
+ // get controller
+ VpeController controller = TestUtil.getVpeController(part);
+ assertNotNull(controller);
+
+ // get source document
+ Document sourceDocument = getSourceDocument(controller);
+ assertNotNull(sourceDocument);
+
+ Element openOnTestedElement = sourceDocument
+ .getElementById(ON_PAGE_STYLE_TEST_TAG_ID);
+ Attr testedClassAttr = openOnTestedElement
+ .getAttributeNode(CLASS_ATTRIBUTE);
+
+ OpenOnUtil.performOpenOnAction(part.getSourceEditor(),
+ ((IDOMAttr) testedClassAttr).getValueRegionStartOffset() + 1);
+
+ IStructuredSelection selection = (IStructuredSelection) PlatformUI
+ .getWorkbench().getActiveWorkbenchWindow().getActivePage()
+ .getSelection();
+
+ TestUtil.waitForJobs();
+
+ Node cssClassNode = (Node) selection.getFirstElement();
+
+ assertEquals(cssClassNode.getParentNode().getLocalName().toLowerCase(),
+ HTML.TAG_STYLE.toLowerCase());
+
+ assertTrue(cssClassNode.getNodeValue().contains(
+ testedClassAttr.getValue()));
+
+ // check exception
+ if (getException() != null) {
+ throw getException();
+ }
+
+ }
+
+ public void testOpenOnLinkStyles() throws Throwable {
+
+ // wait
+ TestUtil.waitForJobs();
+ // set exception
+ setException(null);
+
+ // get test page path
+ IFile file = (IFile) TestUtil.getComponentPath(TEST_PAGE_NAME,
+ JsfAllTests.IMPORT_PROJECT_NAME);
+
+ assertNotNull("Could not open specified file. componentPage = "
+ + TEST_PAGE_NAME
+ + ";projectName = " + JsfAllTests.IMPORT_PROJECT_NAME, file);//$NON-NLS-1$
+
+ IEditorInput input = new FileEditorInput(file);
+
+ assertNotNull("Editor input is null", input);
+ // open and get editor
+ JSPMultiPageEditor part = openEditor(input);
+
+ // get controller
+ VpeController controller = TestUtil.getVpeController(part);
+ assertNotNull(controller);
+
+ // get source document
+ Document sourceDocument = getSourceDocument(controller);
+ assertNotNull(sourceDocument);
+
+ Element openOnTestedElement = sourceDocument
+ .getElementById(LINK_STYLE_TEST_TAG_ID);
+ Attr testedClassAttr = openOnTestedElement
+ .getAttributeNode(CLASS_ATTRIBUTE);
+
+ OpenOnUtil.performOpenOnAction(part.getSourceEditor(),
+ ((IDOMAttr) testedClassAttr).getValueRegionStartOffset() + 1);
+
+ IStructuredSelection selection = (IStructuredSelection) PlatformUI
+ .getWorkbench().getActiveWorkbenchWindow().getActivePage()
+ .getSelection();
+
+ TestUtil.waitForJobs();
+
+ CSSStyleRule cssClassNode = (CSSStyleRule) selection.getFirstElement();
+
+ assertTrue(cssClassNode.getSelectorText().contains(
+ testedClassAttr.getNodeValue()));
+
+ // check exception
+ if (getException() != null) {
+ throw getException();
+ }
+
+ }
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnCssClassTest_JBIDE4775.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/OpenOnUtil.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/OpenOnUtil.java (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/OpenOnUtil.java 2009-08-24 16:39:57 UTC (rev 17243)
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2009 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.vpe.ui.test;
+
+import java.lang.reflect.Method;
+
+import org.eclipse.jface.text.Region;
+import org.eclipse.jface.text.hyperlink.IHyperlink;
+import org.eclipse.jface.text.hyperlink.IHyperlinkDetector;
+import org.eclipse.jface.text.source.SourceViewerConfiguration;
+import org.eclipse.ui.texteditor.AbstractTextEditor;
+import org.eclipse.wst.sse.ui.StructuredTextEditor;
+import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
+
+/**
+ * @author Sergey Dzmitrovich
+ *
+ */
+public class OpenOnUtil {
+
+ /**
+ * method does open on action in editor
+ *
+ * @param textEditor
+ * @param lineNumber
+ * @param lineOffset
+ * @throws Throwable
+ */
+ public static final void performOpenOnAction(
+ StructuredTextEditor textEditor, int offset) throws Throwable {
+
+ // hack to get hyperlinks detectors, no other was have been founded
+ Method method = AbstractTextEditor.class
+ .getDeclaredMethod("getSourceViewerConfiguration"); //$NON-NLS-1$
+ method.setAccessible(true);
+ SourceViewerConfiguration sourceViewerConfiguration = (SourceViewerConfiguration) method
+ .invoke(textEditor);
+ IHyperlinkDetector[] hyperlinkDetectors = sourceViewerConfiguration
+ .getHyperlinkDetectors(textEditor.getTextViewer());
+
+ for (IHyperlinkDetector iHyperlinkDetector : hyperlinkDetectors) {
+ IHyperlink[] hyperLinks = iHyperlinkDetector.detectHyperlinks(
+ textEditor.getTextViewer(), new Region(offset, 0), false);
+ if (hyperLinks != null && hyperLinks.length > 0
+ && hyperLinks[0] instanceof AbstractHyperlink) {
+ AbstractHyperlink abstractHyperlink = (AbstractHyperlink) hyperLinks[0];
+ abstractHyperlink.open();
+ break;
+ }
+ }
+
+ }
+
+}
Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/OpenOnUtil.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
16 years, 7 months
- 1
- 0
JBoss Tools SVN: r17242 - trunk/jsf/docs/userguide/en.
by jbosstools-commits＠lists.jboss.org
Author: chukhutsina
Date: 2009-08-24 10:49:12 -0400 (Mon, 24 Aug 2009)
New Revision: 17242
Modified:
trunk/jsf/docs/userguide/en/master.xml
Log:
<html><head><meta name="qrichtext" content="1" /></head><body style="font-size:9pt;font-family:Sans Serif">
<p>https://jira.jboss.org/jira/browse/JBDS-825 - JBoss CSS Editing Perspective was described in Doc - VisualWebTools:new chapter CSS Editing Perspective was created. </p>
</body></html>
Modified: trunk/jsf/docs/userguide/en/master.xml
===================================================================
--- trunk/jsf/docs/userguide/en/master.xml 2009-08-24 14:06:03 UTC (rev 17241)
+++ trunk/jsf/docs/userguide/en/master.xml 2009-08-24 14:49:12 UTC (rev 17242)
@@ -6,6 +6,7 @@
<!ENTITY Visual_Web_Tools SYSTEM "modules/Visual_Web_Tools.xml">
<!ENTITY springTools SYSTEM "modules/spring_tools.xml">
<!ENTITY editors SYSTEM "modules/editors.xml">
+<!ENTITY cssPerspective SYSTEM "modules/css_perspective.xml">
<!ENTITY palette SYSTEM "modules/palette.xml">
<!ENTITY richfaces_support SYSTEM "modules/richfaces_support.xml">
<!ENTITY web_projects SYSTEM "modules/web_projects.xml">
@@ -56,6 +57,7 @@
&springTools;
&editors;
&palette;
+ &cssPerspective;
&richfaces_support;
&web_projects;
&preferences;
16 years, 7 months
- 1
- 0
JBoss Tools SVN: r17241 - workspace/examples and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2009-08-24 10:06:03 -0400 (Mon, 24 Aug 2009)
New Revision: 17241
Added:
workspace/examples/project-examples-3.0.2.xml
Modified:
branches/jbosstools-3.0.x/examples/plugins/org.jboss.tools.project.examples/plugin.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-4594 Add Project Examples that will work with EAP 5.0
Modified: branches/jbosstools-3.0.x/examples/plugins/org.jboss.tools.project.examples/plugin.xml
===================================================================
--- branches/jbosstools-3.0.x/examples/plugins/org.jboss.tools.project.examples/plugin.xml 2009-08-24 13:55:51 UTC (rev 17240)
+++ branches/jbosstools-3.0.x/examples/plugins/org.jboss.tools.project.examples/plugin.xml 2009-08-24 14:06:03 UTC (rev 17241)
@@ -45,5 +45,10 @@
point="org.jboss.tools.project.examples.projectExamplesXml">
<url>http://download.jboss.org/jbosstools/examples/project-examples-3.0.xml</url>
</extension>
+
+ <extension
+ point="org.jboss.tools.project.examples.projectExamplesXml">
+ <url>http://anonsvn.jboss.org/repos/jbosstools/workspace/examples/project-exam...</url>
+ </extension>
</plugin>
Added: workspace/examples/project-examples-3.0.2.xml
===================================================================
--- workspace/examples/project-examples-3.0.2.xml (rev 0)
+++ workspace/examples/project-examples-3.0.2.xml 2009-08-24 14:06:03 UTC (rev 17241)
@@ -0,0 +1,16 @@
+<projects>
+ <project>
+ <category>Seam</category>
+ <name>photoalbum</name>
+ <included-projects>
+ photoalbum,photoalbum-ear,photoalbum-ejb
+ </included-projects>
+ <shortDescription>PhotoAlbum - EAR (RichFaces 3.3.1.GA, Seam 2.2.0.CR1)</shortDescription>
+ <description>This example demonstrates the use of RichFaces components. It includes the photoalbum,photoalbum-ear and photoalbum-ejb projects.
+ </description>
+ <size>25833472</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/seam-examples/...
+ </url>
+ </project>
+</projects>
16 years, 7 months
- 1
- 0