JBoss Tools SVN: r19717 - workspace/examples and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2010-01-12 16:08:10 -0500 (Tue, 12 Jan 2010)
New Revision: 19717
Added:
workspace/examples/project-examples-jbds30.xml
Modified:
trunk/examples/plugins/org.jboss.tools.project.examples/plugin.properties
trunk/examples/plugins/org.jboss.tools.project.examples/plugin.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-5665 Add stable JBoss Developer Studio 3.0 Examples site
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/plugin.properties
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/plugin.properties 2010-01-12 19:19:44 UTC (rev 19716)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/plugin.properties 2010-01-12 21:08:10 UTC (rev 19717)
@@ -6,6 +6,7 @@
Project_Examples_command =Project Examples...
ProjectExamples=Project Examples file
JBoss_Developer_Studio_Examples = JBoss Developer Studio Examples
+JBoss_Developer_Studio30_Examples = JBoss Developer Studio 3.0 Examples
JBoss_Tools_Community_Examples = JBoss Tools Community Examples
JBoss_Tools_Community_Examples_3.1M4 = JBoss Tools Community Examples(for 3.1M3 or higher)
Project_Examples = Project Examples
\ No newline at end of file
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/plugin.xml
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/plugin.xml 2010-01-12 19:19:44 UTC (rev 19716)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/plugin.xml 2010-01-12 21:08:10 UTC (rev 19717)
@@ -62,6 +62,13 @@
<extension
point="org.jboss.tools.project.examples.projectExamplesXml"
+ name="%JBoss_Developer_Studio30_Examples">
+ <url>http://download.jboss.org/jbosstools/examples/project-examples-jbds30.xml</url>
+ <experimental>false</experimental>
+ </extension>
+
+ <extension
+ point="org.jboss.tools.project.examples.projectExamplesXml"
name="%JBoss_Tools_Community_Examples">
<url>http://anonsvn.jboss.org/repos/jbosstools/workspace/examples/project-exam... </url>
<experimental>false</experimental>
Added: workspace/examples/project-examples-jbds30.xml
===================================================================
--- workspace/examples/project-examples-jbds30.xml (rev 0)
+++ workspace/examples/project-examples-jbds30.xml 2010-01-12 21:08:10 UTC (rev 19717)
@@ -0,0 +1,4 @@
+<projects>
+
+</projects>
+
15 years, 11 months
JBoss Tools SVN: r19716 - in trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui: src/org/jboss/ide/eclipse/as/wtp/ui/propertypage and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-01-12 14:19:44 -0500 (Tue, 12 Jan 2010)
New Revision: 19716
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/impl/JEEModuleDependenciesPropertyPage.java
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/impl/JEEModuleDependencyPageProvider.java
Removed:
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/impl/EarModuleDependenciesPropertyPage.java
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/impl/EarModuleDependencyPageProvider.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/plugin.xml
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/AddModuleDependenciesPropertiesPage.java
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/NewReferenceRootWizardFragment.java
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/NewReferenceWizard.java
Log:
JBIDE-5510 - hiding jbt reference types from wtp assembly pages
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 2010-01-12 16:36:45 UTC (rev 19715)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/plugin.xml 2010-01-12 19:19:44 UTC (rev 19716)
@@ -26,8 +26,8 @@
<extension
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.ui.earDependencyPage">
+ class="org.jboss.ide.eclipse.as.wtp.ui.propertypage.impl.JEEModuleDependencyPageProvider"
+ id="org.jboss.ide.eclipse.as.wtp.ui.jeeDependencyPage">
</dependencyPage>
</extension>
<extension
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/AddModuleDependenciesPropertiesPage.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/AddModuleDependenciesPropertiesPage.java 2010-01-12 16:36:45 UTC (rev 19715)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/AddModuleDependenciesPropertiesPage.java 2010-01-12 19:19:44 UTC (rev 19716)
@@ -85,6 +85,7 @@
import org.eclipse.wst.server.ui.wizard.WizardFragment;
import org.jboss.ide.eclipse.as.wtp.ui.Messages;
import org.jboss.ide.eclipse.as.wtp.ui.WTPOveridePlugin;
+import org.jboss.ide.eclipse.as.wtp.ui.propertypage.DependencyPageExtensionManager.ReferenceExtension;
public class AddModuleDependenciesPropertiesPage implements Listener,
IModuleDependenciesControl, ILabelProviderListener {
@@ -466,9 +467,13 @@
showReferenceWizard(true);
}
+ protected ReferenceExtension[] getReferenceExtensions() {
+ return DependencyPageExtensionManager.getManager().getReferenceExtensions();
+ }
+
protected void showReferenceWizard(boolean editing) {
- NewReferenceWizard wizard = new NewReferenceWizard();
+ NewReferenceWizard wizard = new NewReferenceWizard(getReferenceExtensions());
// fill the task model
wizard.getTaskModel().putObject(NewReferenceWizard.PROJECT, project);
wizard.getTaskModel().putObject(NewReferenceWizard.ROOT_COMPONENT, rootComponent);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/NewReferenceRootWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/NewReferenceRootWizardFragment.java 2010-01-12 16:36:45 UTC (rev 19715)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/NewReferenceRootWizardFragment.java 2010-01-12 19:19:44 UTC (rev 19716)
@@ -26,6 +26,13 @@
new HashMap<String, WizardFragment>();
private IWizardHandle wizard;
private TreeViewer viewer;
+ private ReferenceExtension[] extensions = null;
+ public NewReferenceRootWizardFragment(ReferenceExtension[] extensions) {
+ if( extensions == null )
+ this.extensions = DependencyPageExtensionManager.getManager().getReferenceExtensions();
+ else
+ this.extensions = extensions;
+ }
public boolean hasComposite() {
return true;
}
@@ -119,13 +126,10 @@
return labelProvider;
}
- private ReferenceExtension[] extensions = null;
protected ITreeContentProvider getContentProvider() {
if( contentProvider == null ) {
contentProvider = new ITreeContentProvider() {
public Object[] getElements(Object inputElement) {
- if( extensions == null )
- extensions = DependencyPageExtensionManager.getManager().getReferenceExtensions();
return extensions;
}
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/NewReferenceWizard.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/NewReferenceWizard.java 2010-01-12 16:36:45 UTC (rev 19715)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/NewReferenceWizard.java 2010-01-12 19:19:44 UTC (rev 19716)
@@ -7,6 +7,7 @@
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.server.ui.internal.wizard.TaskWizard;
import org.eclipse.wst.server.ui.wizard.WizardFragment;
+import org.jboss.ide.eclipse.as.wtp.ui.propertypage.DependencyPageExtensionManager.ReferenceExtension;
public class NewReferenceWizard extends TaskWizard {
@@ -17,16 +18,20 @@
public static final String DEPENDENCY_TYPE = "dependency.type";
- public NewReferenceWizard() {
- super("New Reference Wizard", new RootWizardFragment());
+ public NewReferenceWizard(ReferenceExtension[] extensions) {
+ super("New Reference Wizard", new RootWizardFragment(extensions));
getRootFragment().setTaskModel(getTaskModel());
}
protected static class RootWizardFragment extends WizardFragment {
+ private ReferenceExtension[] extensions;
+ public RootWizardFragment(ReferenceExtension[] extensions) {
+ this.extensions = extensions;
+ }
protected void createChildFragments(List<WizardFragment> list) {
IVirtualComponent component = (IVirtualComponent)getTaskModel().getObject(COMPONENT);
if( component == null )
- list.add(new NewReferenceRootWizardFragment());
+ list.add(new NewReferenceRootWizardFragment(extensions));
else {
WizardFragment fragment = getFirstEditingFragment(component);
if( fragment != null )
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/impl/EarModuleDependenciesPropertyPage.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/impl/EarModuleDependenciesPropertyPage.java 2010-01-12 16:36:45 UTC (rev 19715)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/impl/EarModuleDependenciesPropertyPage.java 2010-01-12 19:19:44 UTC (rev 19716)
@@ -1,54 +0,0 @@
-package org.jboss.ide.eclipse.as.wtp.ui.propertypage.impl;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.RemoveComponentFromEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathUpdater;
-import org.eclipse.jst.jee.project.facet.EarCreateDeploymentFilesDataModelProvider;
-import org.eclipse.jst.jee.project.facet.ICreateDeploymentFilesDataModelProperties;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.jboss.ide.eclipse.as.wtp.ui.propertypage.AddModuleDependenciesPropertiesPage;
-import org.jboss.ide.eclipse.as.wtp.ui.propertypage.ModuleAssemblyRootPage;
-
-public class EarModuleDependenciesPropertyPage extends
- AddModuleDependenciesPropertiesPage {
- public EarModuleDependenciesPropertyPage(IProject project,
- ModuleAssemblyRootPage page) {
- super(project, page);
- }
-
- protected IDataModelOperation generateEARDDOperation() {
- IDataModel model = DataModelFactory.createDataModel(new EarCreateDeploymentFilesDataModelProvider());
- model.setProperty(ICreateDeploymentFilesDataModelProperties.GENERATE_DD, rootComponent);
- model.setProperty(ICreateDeploymentFilesDataModelProperties.TARGET_PROJECT, project);
- return model.getDefaultOperation();
- }
-
- public boolean postHandleChanges(IProgressMonitor monitor) {
- return true;
- }
-
- protected void handleRemoved(ArrayList<IVirtualComponent> removed) {
- super.handleRemoved(removed);
- J2EEComponentClasspathUpdater.getInstance().queueUpdateEAR(rootComponent.getProject());
- }
-
- protected IDataModelProvider getRemoveReferenceDataModelProvider(Object component) {
- return new RemoveComponentFromEnterpriseApplicationDataModelProvider();
- }
-
-// protected void postAddProjects(Set moduleProjects) throws CoreException {
-// EarFacetRuntimeHandler.updateModuleProjectRuntime(rootComponent.getProject(), moduleProjects, new NullProgressMonitor());
-// }
-
- protected IDataModelProvider getAddReferenceDataModelProvider(IVirtualComponent component) {
- return new OverrideAddComponentToEnterpriseApplicationDataModelProvider();
- }
-}
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/impl/EarModuleDependencyPageProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/impl/EarModuleDependencyPageProvider.java 2010-01-12 16:36:45 UTC (rev 19715)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/impl/EarModuleDependencyPageProvider.java 2010-01-12 19:19:44 UTC (rev 19716)
@@ -1,30 +0,0 @@
-package org.jboss.ide.eclipse.as.wtp.ui.propertypage.impl;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.jboss.ide.eclipse.as.wtp.ui.propertypage.IDependencyPageProvider;
-import org.jboss.ide.eclipse.as.wtp.ui.propertypage.IModuleDependenciesControl;
-import org.jboss.ide.eclipse.as.wtp.ui.propertypage.ModuleAssemblyRootPage;
-
-public class EarModuleDependencyPageProvider implements IDependencyPageProvider {
-
- public boolean canHandle(IFacetedProject project) {
- boolean isEAR = project.hasProjectFacet(ProjectFacetsManager.getProjectFacet("jst.ear")); //$NON-NLS-1$
- return isEAR;
- }
-
- public IModuleDependenciesControl[] createPages(IFacetedProject project,
- ModuleAssemblyRootPage parent) {
- return new IModuleDependenciesControl[] {
- new EarModuleDependenciesPropertyPage(project.getProject(), parent)
- };
- }
-
- public Composite createRootControl(IModuleDependenciesControl[] pages,
- Composite parent) {
- if( pages.length == 1 && pages[0] != null)
- return pages[0].createContents(parent);
- return null;
- }
-}
Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/impl/JEEModuleDependenciesPropertyPage.java (from rev 19456, trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/impl/EarModuleDependenciesPropertyPage.java)
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/impl/JEEModuleDependenciesPropertyPage.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/impl/JEEModuleDependenciesPropertyPage.java 2010-01-12 19:19:44 UTC (rev 19716)
@@ -0,0 +1,86 @@
+package org.jboss.ide.eclipse.as.wtp.ui.propertypage.impl;
+
+import java.util.ArrayList;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider;
+import org.eclipse.jst.j2ee.application.internal.operations.RemoveComponentFromEnterpriseApplicationDataModelProvider;
+import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathUpdater;
+import org.eclipse.jst.jee.project.facet.EarCreateDeploymentFilesDataModelProvider;
+import org.eclipse.jst.jee.project.facet.ICreateDeploymentFilesDataModelProperties;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
+import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
+import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
+import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
+import org.jboss.ide.eclipse.as.wtp.ui.propertypage.AddModuleDependenciesPropertiesPage;
+import org.jboss.ide.eclipse.as.wtp.ui.propertypage.DependencyPageExtensionManager;
+import org.jboss.ide.eclipse.as.wtp.ui.propertypage.ModuleAssemblyRootPage;
+import org.jboss.ide.eclipse.as.wtp.ui.propertypage.DependencyPageExtensionManager.ReferenceExtension;
+
+public class JEEModuleDependenciesPropertyPage extends
+ AddModuleDependenciesPropertiesPage {
+ public JEEModuleDependenciesPropertyPage(IProject project,
+ ModuleAssemblyRootPage page) {
+ super(project, page);
+ }
+
+ protected ReferenceExtension[] getReferenceExtensions() {
+ ReferenceExtension[] parents = super.getReferenceExtensions();
+ ArrayList<ReferenceExtension> l = new ArrayList<ReferenceExtension>();
+ for( int i = 0; i < parents.length; i++ )
+ if( shouldAddReferenceType(parents[i]))
+ l.add(parents[i]);
+ return (ReferenceExtension[]) l.toArray(new ReferenceExtension[l.size()]);
+ }
+
+ protected boolean shouldAddReferenceType(ReferenceExtension extension) {
+ // approved types
+ String NEW_PROJ = "org.jboss.ide.eclipse.as.wtp.ui.newProjectReference";
+ String JAR = "org.jboss.ide.eclipse.as.wtp.ui.jarReference";
+ String EXT_JAR = "org.jboss.ide.eclipse.as.wtp.ui.externalJarReference";
+ String VAR = "org.jboss.ide.eclipse.as.wtp.ui.variableReference";
+ String id = extension.getId();
+ if( id.equals(NEW_PROJ) || id.equals(JAR) || id.equals(EXT_JAR) || id.equals(VAR) )
+ return true;
+ return false;
+ }
+
+ protected IDataModelOperation generateEARDDOperation() {
+ IDataModel model = DataModelFactory.createDataModel(new EarCreateDeploymentFilesDataModelProvider());
+ model.setProperty(ICreateDeploymentFilesDataModelProperties.GENERATE_DD, rootComponent);
+ model.setProperty(ICreateDeploymentFilesDataModelProperties.TARGET_PROJECT, project);
+ return model.getDefaultOperation();
+ }
+
+ public boolean postHandleChanges(IProgressMonitor monitor) {
+ return true;
+ }
+
+ protected void handleRemoved(ArrayList<IVirtualComponent> removed) {
+ super.handleRemoved(removed);
+ if( isEar())
+ J2EEComponentClasspathUpdater.getInstance().queueUpdateEAR(rootComponent.getProject());
+ }
+
+ protected IDataModelProvider getRemoveReferenceDataModelProvider(IVirtualComponent component) {
+ if( isEar() )
+ return new RemoveComponentFromEnterpriseApplicationDataModelProvider();
+ return super.getRemoveReferenceDataModelProvider(component);
+ }
+
+// protected void postAddProjects(Set moduleProjects) throws CoreException {
+// EarFacetRuntimeHandler.updateModuleProjectRuntime(rootComponent.getProject(), moduleProjects, new NullProgressMonitor());
+// }
+
+ protected IDataModelProvider getAddReferenceDataModelProvider(IVirtualComponent component) {
+ if( isEar() )
+ return new OverrideAddComponentToEnterpriseApplicationDataModelProvider();
+ return super.getAddReferenceDataModelProvider(component);
+ }
+
+ protected boolean isEar() {
+ return false;
+ }
+}
Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/impl/JEEModuleDependencyPageProvider.java (from rev 18927, trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/impl/EarModuleDependencyPageProvider.java)
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/impl/JEEModuleDependencyPageProvider.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/impl/JEEModuleDependencyPageProvider.java 2010-01-12 19:19:44 UTC (rev 19716)
@@ -0,0 +1,31 @@
+package org.jboss.ide.eclipse.as.wtp.ui.propertypage.impl;
+
+import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.wst.common.project.facet.core.IFacetedProject;
+import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+import org.jboss.ide.eclipse.as.wtp.ui.propertypage.IDependencyPageProvider;
+import org.jboss.ide.eclipse.as.wtp.ui.propertypage.IModuleDependenciesControl;
+import org.jboss.ide.eclipse.as.wtp.ui.propertypage.ModuleAssemblyRootPage;
+
+public class JEEModuleDependencyPageProvider implements IDependencyPageProvider {
+
+ public boolean canHandle(IFacetedProject project) {
+ return J2EEProjectUtilities.isJEEProject(project.getProject())
+ || J2EEProjectUtilities.isLegacyJ2EEProject(project.getProject());
+ }
+
+ public IModuleDependenciesControl[] createPages(IFacetedProject project,
+ ModuleAssemblyRootPage parent) {
+ return new IModuleDependenciesControl[] {
+ new JEEModuleDependenciesPropertyPage(project.getProject(), parent)
+ };
+ }
+
+ public Composite createRootControl(IModuleDependenciesControl[] pages,
+ Composite parent) {
+ if( pages.length == 1 && pages[0] != null)
+ return pages[0].createContents(parent);
+ return null;
+ }
+}
15 years, 11 months
JBoss Tools SVN: r19715 - trunk/bpel/releng/maps.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-01-12 11:36:45 -0500 (Tue, 12 Jan 2010)
New Revision: 19715
Modified:
trunk/bpel/releng/maps/mozilla.map
Log:
https://jira.jboss.org/jira/browse/JBIDE-5033: recompiled on a system with glibc <=2.12 (JBDS and RHEL5 will be compatible)
Modified: trunk/bpel/releng/maps/mozilla.map
===================================================================
--- trunk/bpel/releng/maps/mozilla.map 2010-01-12 15:12:06 UTC (rev 19714)
+++ trunk/bpel/releng/maps/mozilla.map 2010-01-12 16:36:45 UTC (rev 19715)
@@ -6,6 +6,6 @@
feature@org.mozilla.xulrunner.feature,1.9.1.0_v20090825-1855-57Z379OhF77g7cFR37gN7=GET,http://repository.jboss.com/xulrunner/org.mozilla.xulrunner.feature_1.9.1.0_v20090825-1855-57Z379OhF77g7cFR37gN7.jar
plugin@org.mozilla.xulrunner.win32.win32.x86,1.9.1.2=GET,http://repository.jboss.com/xulrunner/org.mozilla.xulrunner.win32.win32.x86_1.9.1.2.jar
plugin@org.mozilla.xulrunner.gtk.linux,1.9.1.2=GET,http://repository.jboss.com/xulrunner/org.mozilla.xulrunner.gtk.linux.x86_1.9.1.2.jar
-plugin@org.mozilla.xulrunner.gtk.linux.x86_64,1.9.1.2=GET,http://repository.jboss.com/xulrunner/org.mozilla.xulrunner.gtk.linux.x86_64_1.9.1.2.jar
+plugin@org.mozilla.xulrunner.gtk.linux.x86_64,1.9.1.2a=GET,http://repository.jboss.com/xulrunner/org.mozilla.xulrunner.gtk.linux.x86_64_1.9.1.2a.jar
plugin@org.mozilla.xulrunner.carbon.macosx,1.9.1.2=GET,http://repository.jboss.com/xulrunner/org.mozilla.xulrunner.carbon.macosx_1.9.1.2.jar
plugin@org.mozilla.xulrunner.cocoa.macosx,1.9.1.2=GET,http://repository.jboss.com/xulrunner/org.mozilla.xulrunner.cocoa.macosx_1.9.1.2.jar
15 years, 11 months
JBoss Tools SVN: r19714 - in trunk/esb/plugins/org.jboss.tools.esb.core: resources/help and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-01-12 10:12:06 -0500 (Tue, 12 Jan 2010)
New Revision: 19714
Added:
trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddContentBasedRouterSupport.java
Modified:
trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml
trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-menu.properties
trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties
trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
Log:
https://jira.jboss.org/jira/browse/JBIDE-5627
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml 2010-01-12 14:06:33 UTC (rev 19713)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml 2010-01-12 15:12:06 UTC (rev 19714)
@@ -43,6 +43,8 @@
class="org.jboss.tools.esb.core.model.handlers.AddProviderSupport"/>
<xclass id="org.jboss.tools.esb.core.model.handlers.AddGenericActionSupport"
class="org.jboss.tools.esb.core.model.handlers.AddGenericActionSupport"/>
+ <xclass id="org.jboss.tools.esb.core.model.handlers.AddContentBasedRouterSupport"
+ class="org.jboss.tools.esb.core.model.handlers.AddContentBasedRouterSupport"/>
<xclass id="org.jboss.tools.esb.core.model.handlers.OpenESBResourceHandler"
class="org.jboss.tools.esb.core.model.handlers.OpenESBResourceHandler"/>
<xclass id="org.jboss.tools.esb.core.model.handlers.AddJBRListerer12Handler"
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-menu.properties
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-menu.properties 2010-01-12 14:06:33 UTC (rev 19713)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-menu.properties 2010-01-12 15:12:06 UTC (rev 19714)
@@ -41,7 +41,11 @@
ESB.AddCommandInterpreter.menu=Command Interpreter...
ESB.AddGroovyProcessor.menu=Groovy Action Processor...
ESB.AddAggregator.menu=Aggregator...
-ESB.AddContentBasedRouter.menu=Content Based Router...
+ESB.AddContentBasedRouter.menu=Content Based Router (Generic)...
+ESB.AddContentBasedRouterDrools.menu=Content Based Router (Drools)...
+ESB.AddContentBasedRouterDroolsXPath.menu=Content Based Router (Drools XPath)...
+ESB.AddContentBasedRouterRegex.menu=Content Based Router (Regex)...
+ESB.AddContentBasedRouterXPath.menu=Content Based Router (XPath)...
ESB.AddStaticRouter.menu=Static Router...
ESB.AddStaticWiretap.menu=Static Wiretap...
ESB.AddNotifier.menu=Notifier...
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties 2010-01-12 14:06:33 UTC (rev 19713)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties 2010-01-12 15:12:06 UTC (rev 19714)
@@ -498,6 +498,19 @@
ESB.AddContentBasedRouter.WindowTitle=Add Content Based Router
ESB.AddContentBasedRouter.Title=ESB Content Based Router
+ESB.AddContentBasedRouterDrools.WindowTitle=Add Drools Router
+ESB.AddContentBasedRouterDrools.Title=ESB Drools Router
+
+ESB.AddContentBasedRouterDroolsXPath.WindowTitle=Add Drools XPath Router
+ESB.AddContentBasedRouterDroolsXPath.Title=ESB Drools XPath Router
+
+ESB.AddContentBasedRouterRegex.WindowTitle=Add Regex Router
+ESB.AddContentBasedRouterRegex.Title=ESB Regex Router
+
+ESB.AddContentBasedRouterXPath.WindowTitle=Add XPath Router
+ESB.AddContentBasedRouterXPath.Title=ESB XPath Router
+
+
ESB.AddStaticRouter.WindowTitle=Add Static Router
ESB.AddStaticRouter.Title=ESB Static Router
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2010-01-12 14:06:33 UTC (rev 19713)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2010-01-12 15:12:06 UTC (rev 19714)
@@ -3337,9 +3337,34 @@
<AttributeData AttributeName="timeout in millies" Mandatory="no"/>
</EntityData>
</XActionItem>
+ <XActionItem HandlerClassName="%SpecialWizard%"
+ ICON="action.empty"
+ PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddContentBasedRouterSupport;cbrAlias=Drools"
+ displayName="Content Based Router (Drools)..." kind="action" name="AddContentBasedRouterDrools">
+ <EntityData EntityName="ESBPreActionContentBasedRouter120">
+ <AttributeData AttributeName="name"/>
+ <AttributeData AttributeName="process" Mandatory="no"/>
+ <AttributeData AttributeName="rule set" Mandatory="no"/>
+ <AttributeData AttributeName="rule language" Mandatory="no"/>
+ <AttributeData AttributeName="rule reload" Mandatory="no"/>
+ </EntityData>
+ </XActionItem>
+ <XActionItem HandlerClassName="%SpecialWizard%"
+ ICON="action.empty"
+ PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddContentBasedRouterSupport;cbrAlias=Drools"
+ displayName="Content Based Router (Drools XPath)..."
+ kind="action" name="AddContentBasedRouterDroolsXPath">
+ <EntityData EntityName="ESBPreActionContentBasedRouter120">
+ <AttributeData AttributeName="name"/>
+ <AttributeData AttributeName="process" Mandatory="no"/>
+ <AttributeData AttributeName="rule set" Mandatory="no"/>
+ <AttributeData AttributeName="rule language" Mandatory="no"/>
+ <AttributeData AttributeName="rule reload" Mandatory="no"/>
+ </EntityData>
+ </XActionItem>
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
PROPERTIES="validator.add=true" WizardClassName="%Default%"
- displayName="Content Based Router..." kind="action" name="AddContentBasedRouter">
+ displayName="Content Based Router (Generic)..." kind="action" name="AddContentBasedRouter">
<EntityData EntityName="ESBPreActionContentBasedRouter120">
<AttributeData AttributeName="name"/>
<AttributeData AttributeName="cbr alias" Mandatory="no"/>
@@ -3349,6 +3374,30 @@
<AttributeData AttributeName="rule reload" Mandatory="no"/>
</EntityData>
</XActionItem>
+ <XActionItem HandlerClassName="%SpecialWizard%"
+ ICON="action.empty"
+ PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddContentBasedRouterSupport;cbrAlias=Regex"
+ displayName="Content Based Router (Regex)..." kind="action" name="AddContentBasedRouterRegex">
+ <EntityData EntityName="ESBPreActionContentBasedRouter120">
+ <AttributeData AttributeName="name"/>
+ <AttributeData AttributeName="process" Mandatory="no"/>
+ <AttributeData AttributeName="rule set" Mandatory="no"/>
+ <AttributeData AttributeName="rule language" Mandatory="no"/>
+ <AttributeData AttributeName="rule reload" Mandatory="no"/>
+ </EntityData>
+ </XActionItem>
+ <XActionItem HandlerClassName="%SpecialWizard%"
+ ICON="action.empty"
+ PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddContentBasedRouterSupport;cbrAlias=XPath"
+ displayName="Content Based Router (XPath)..." kind="action" name="AddContentBasedRouterXPath">
+ <EntityData EntityName="ESBPreActionContentBasedRouter120">
+ <AttributeData AttributeName="name"/>
+ <AttributeData AttributeName="process" Mandatory="no"/>
+ <AttributeData AttributeName="rule set" Mandatory="no"/>
+ <AttributeData AttributeName="rule language" Mandatory="no"/>
+ <AttributeData AttributeName="rule reload" Mandatory="no"/>
+ </EntityData>
+ </XActionItem>
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
PROPERTIES="validator.add=true" WizardClassName="%Default%"
displayName="EMail Router..." kind="action" name="AddEMailRouter">
Added: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddContentBasedRouterSupport.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddContentBasedRouterSupport.java (rev 0)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddContentBasedRouterSupport.java 2010-01-12 15:12:06 UTC (rev 19714)
@@ -0,0 +1,26 @@
+package org.jboss.tools.esb.core.model.handlers;
+
+import java.util.Properties;
+
+import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler;
+import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateSupport;
+import org.jboss.tools.common.model.XModelException;
+import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
+
+public class AddContentBasedRouterSupport extends DefaultCreateSupport {
+
+ public AddContentBasedRouterSupport() {}
+
+ protected void finish() throws XModelException {
+ String entity = getEntityName();
+ Properties p = extractStepData(0);
+ String cbrAlias = action.getProperty("cbrAlias");
+ if(cbrAlias != null) {
+ p.setProperty("cbr alias", cbrAlias);
+ }
+ XModelObject action = XModelObjectLoaderUtil.createValidObject(getTarget().getModel(), entity, p);
+ DefaultCreateHandler.addCreatedObject(getTarget(), action, getProperties());
+ }
+
+}
Property changes on: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddContentBasedRouterSupport.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 11 months
JBoss Tools SVN: r19713 - trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-01-12 09:06:33 -0500 (Tue, 12 Jan 2010)
New Revision: 19713
Modified:
trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
Log:
https://jira.jboss.org/jira/browse/JBIDE-5652
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2010-01-12 13:59:29 UTC (rev 19712)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2010-01-12 14:06:33 UTC (rev 19713)
@@ -3344,7 +3344,7 @@
<AttributeData AttributeName="name"/>
<AttributeData AttributeName="cbr alias" Mandatory="no"/>
<AttributeData AttributeName="process" Mandatory="no"/>
- <AttributeData AttributeName="rule set"/>
+ <AttributeData AttributeName="rule set" Mandatory="no"/>
<AttributeData AttributeName="rule language" Mandatory="no"/>
<AttributeData AttributeName="rule reload" Mandatory="no"/>
</EntityData>
15 years, 11 months
JBoss Tools SVN: r19712 - trunk/seam/plugins/org.jboss.tools.seam.core/templates/hibernatetools.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2010-01-12 08:59:29 -0500 (Tue, 12 Jan 2010)
New Revision: 19712
Removed:
trunk/seam/plugins/org.jboss.tools.seam.core/templates/hibernatetools/hibernate-console.properties
Log:
https://jira.jboss.org/jira/browse/JBIDE-5570
Copy full hibernate.properties from seamgen.
Deleted: trunk/seam/plugins/org.jboss.tools.seam.core/templates/hibernatetools/hibernate-console.properties
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/templates/hibernatetools/hibernate-console.properties 2010-01-12 13:53:39 UTC (rev 19711)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/templates/hibernatetools/hibernate-console.properties 2010-01-12 13:59:29 UTC (rev 19712)
@@ -1,4 +0,0 @@
-#File used by hibernate tools to override <datasource> and other container specific settings in persistence.xml
-hibernate.connection.provider_class org.hibernate.connection.DriverManagerConnectionProvider
-hibernate.datasource=
-hibernate.transaction.manager_lookup_class=
\ No newline at end of file
15 years, 11 months
JBoss Tools SVN: r19711 - in trunk/seam/plugins: org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2010-01-12 08:53:39 -0500 (Tue, 12 Jan 2010)
New Revision: 19711
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5570
Copy full hibernate.properties from seamgen.
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java 2010-01-12 13:43:15 UTC (rev 19710)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java 2010-01-12 13:53:39 UTC (rev 19711)
@@ -768,11 +768,8 @@
dataSourceDsFile = new File(seamGenResFolder, "datasource-ds.xml"); //$NON-NLS-1$
componentsFile = new File(seamGenResFolder, "WEB-INF/components" + (isWarConfiguration(model) ? "-war" : "") + ".xml"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- try {
- hibernateConsolePropsFile = new File(SeamFacetInstallDataModelProvider.getTemplatesFolder(), "hibernatetools/hibernate-console.properties"); //$NON-NLS-1$
- } catch (IOException e) {
- SeamCorePlugin.getPluginLog().logError(e);
- }
+ hibernateConsolePropsFile = new File(seamGenHomeFolder, "hibernatetools/hibernate-console.properties"); //$NON-NLS-1$
+
/*if (jpaVersion != null) {
IScopeContext context = new ProjectScope(project);
IEclipsePreferences prefs = context.getNode("org.eclipse.jpt.core");
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java 2010-01-12 13:43:15 UTC (rev 19710)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java 2010-01-12 13:53:39 UTC (rev 19711)
@@ -137,10 +137,10 @@
try {
hibernateConsoleLaunchFile = new File(SeamFacetInstallDataModelProvider.getTemplatesFolder(), "hibernatetools/hibernate-console.launch");
- hibernateConsolePropsFile = new File(SeamFacetInstallDataModelProvider.getTemplatesFolder(), "hibernatetools/hibernate-console.properties"); //$NON-NLS-1$
} catch (IOException e) {
SeamCorePlugin.getPluginLog().logError(e);
}
+ hibernateConsolePropsFile = new File(seamGenHomeFolder, "hibernatetools/hibernate-console.properties"); //$NON-NLS-1$
//hibernateConsoleLaunchFile = new File(seamGenHomeFolder, "hibernatetools/hibernate-console.launch"); //$NON-NLS-1$
dataSourceDsFile = new File(seamGenResFolder, "datasource-ds.xml"); //$NON-NLS-1$
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2010-01-12 13:43:15 UTC (rev 19710)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2010-01-12 13:53:39 UTC (rev 19711)
@@ -115,7 +115,7 @@
// Database group
private IFieldEditor connProfileSelEditor;
- //private IFieldEditor jBossHibernateDbTypeEditor ;
+ private IFieldEditor jBossHibernateDbTypeEditor ;
private IFieldEditor dbSchemaName;
@@ -284,11 +284,11 @@
model.setStringProperty(ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE, getJpaConnectionProfile());
}
- /*if (jBossHibernateDbTypeEditor != null) {
+ if (jBossHibernateDbTypeEditor != null) {
SeamCorePlugin.getDefault().getPluginPreferences().setValue(
SeamProjectPreferences.HIBERNATE_DEFAULT_DB_TYPE,
this.jBossHibernateDbTypeEditor.getValueAsString());
- }*/
+ }
SeamCorePlugin.getDefault().getPluginPreferences().setValue(
SeamProjectPreferences.JBOSS_AS_DEFAULT_DEPLOY_AS,
@@ -399,6 +399,13 @@
databaseGroup.setText(SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_DATABASE);
gridLayout = new GridLayout(4, false);
databaseGroup.setLayout(gridLayout);
+
+ jBossHibernateDbTypeEditor = IFieldEditorFactory.INSTANCE
+ .createComboEditor(ISeamFacetDataModelProperties.DB_TYPE,
+ SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_DATABASE_TYPE,
+ Arrays.asList(HIBERNATE_HELPER.getDialectNames()),
+ getDefaultDbType(), false);
+ registerEditor(jBossHibernateDbTypeEditor, databaseGroup, 4);
createDatabaseGoupControl();
@@ -506,7 +513,7 @@
SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_DATABASE_CATALOG_NAME,
""); //$NON-NLS-1$
- /*jBossHibernateDbTypeEditor
+ jBossHibernateDbTypeEditor
.addPropertyChangeListener(new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent evt) {
SeamInstallWizardPage.this.model
@@ -516,7 +523,7 @@
.getNewValue().toString()));
}
});
- registerEditor(jBossHibernateDbTypeEditor, databaseGroup, 4);*/
+ //registerEditor(jBossHibernateDbTypeEditor, databaseGroup, 4);
registerEditor(connProfileSelEditor, databaseGroup, 4);
registerEditor(dbSchemaName, databaseGroup, 4);
registerEditor(dbCatalogName, databaseGroup, 4);
15 years, 11 months
JBoss Tools SVN: r19710 - in trunk: jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2010-01-12 08:43:15 -0500 (Tue, 12 Jan 2010)
New Revision: 19710
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFMessageELCompletionEngine.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5289
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java 2010-01-12 12:03:04 UTC (rev 19709)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java 2010-01-12 13:43:15 UTC (rev 19710)
@@ -129,7 +129,8 @@
ELResolutionImpl resolution = null;
try {
resolution = resolveELOperand(context.getResource(), operand, true, vars, new ElVarSearcher(context.getResource(), this));
- resolution.setContext(context);
+ if(resolution != null)
+ resolution.setContext(context);
} catch (StringIndexOutOfBoundsException e) {
log(e);
} catch (BadLocationException e) {
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFMessageELCompletionEngine.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFMessageELCompletionEngine.java 2010-01-12 12:03:04 UTC (rev 19709)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFMessageELCompletionEngine.java 2010-01-12 13:43:15 UTC (rev 19710)
@@ -113,7 +113,8 @@
*/
public ELResolution resolve(ELContext context, ELExpression operand, int offset) {
ELResolutionImpl resolution = resolveELOperand(operand, context, true);
- resolution.setContext(context);
+ if(resolution != null)
+ resolution.setContext(context);
return resolution;
}
15 years, 11 months
JBoss Tools SVN: r19709 - in trunk/esb/plugins/org.jboss.tools.esb.core/resources: meta and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-01-12 07:03:04 -0500 (Tue, 12 Jan 2010)
New Revision: 19709
Modified:
trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-attrs.properties
trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
Log:
https://jira.jboss.org/jira/browse/JBIDE-5594
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-attrs.properties
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-attrs.properties 2010-01-12 11:50:11 UTC (rev 19708)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-attrs.properties 2010-01-12 12:03:04 UTC (rev 19709)
@@ -101,6 +101,7 @@
ESB.insert_timestamp_column=Insert Timestamp Column
ESB.datasource=Datasource
ESB.url=URL
+ESB.uri=URI
ESB.driver=Driver
ESB.poll_frequency_seconds=Poll Frequency Seconds
ESB.schedule_frequency=Schedule Frequency
@@ -157,4 +158,15 @@
ESB.auth=Auth
ESB.message_attachment_name=Message Attachment Name
ESB.cbr_alias=CBR Alias
-ESB.expression=Expression
\ No newline at end of file
+ESB.expression=Expression
+ESB.reply_to_originator=Reply to Originator
+ESB.list_files=List Files
+ESB.delete_list_file=Delete List File
+ESB.file_name=File Name
+ESB.append=Append
+ESB.jndi_name=JNDI Name
+ESB.jndi_url=JNDI URL
+ESB.jndi_context_factory=JNDI Context Factory
+ESB.jndi_pkg_prefix=JNDI pkg Prefix
+ESB.connection_factory=Connection Factory
+ESB.attachment_name=Message Attachment Name
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2010-01-12 11:50:11 UTC (rev 19708)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2010-01-12 12:03:04 UTC (rev 19709)
@@ -165,6 +165,15 @@
<XModelAttribute PROPERTIES="pre=true;category=general" name="key" xmlname="key"/>
<XModelAttribute PROPERTIES="pre=true;category=general"
name="transition name" xmlname="transition-name"/>
+ <XModelAttribute PROPERTIES="pre=true;category=general"
+ default="Default(false)" name="reply to originator" xmlname="reply-to-originator">
+ <Constraint loader="ListString">
+ <value name="Default(false)"/>
+ <value name="true"/>
+ <value name="false"/>
+ </Constraint>
+ <Editor name="ListString"/>
+ </XModelAttribute>
<XModelAttribute PROPERTIES="category=general" name="process" xmlname="process">
<Constraint loader="ListString">
<value name="process"/>
15 years, 11 months
JBoss Tools SVN: r19708 - trunk/vpe/plugins/org.jboss.tools.vpe/ve.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2010-01-12 06:50:11 -0500 (Tue, 12 Jan 2010)
New Revision: 19708
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/ve/init.html
Log:
https://jira.jboss.org/jira/browse/JBIDE-5603
Incorrect selection for HTML DOCTYPE
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/ve/init.html
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/ve/init.html 2010-01-12 11:37:24 UTC (rev 19707)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/ve/init.html 2010-01-12 11:50:11 UTC (rev 19708)
@@ -31,6 +31,7 @@
}
#__content__area__ {
+ display: table;
width:100%;
height:100%;
min-height:50px;
15 years, 11 months