JBoss Tools SVN: r26196 - trunk/modeshape/plugins/org.jboss.tools.modeshape.rest.
by jbosstools-commits＠lists.jboss.org
Author: elvisisking
Date: 2010-11-02 17:10:17 -0400 (Tue, 02 Nov 2010)
New Revision: 26196
Modified:
trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/plugin.xml
Log:
JBIDE-7487 ModeShape Tools Context Menu Actions Missing Images: Icons to context menu were added back in. They were dropped when converted from actions to commands and handlers.
Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/plugin.xml
===================================================================
--- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/plugin.xml 2010-11-02 19:23:25 UTC (rev 26195)
+++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/plugin.xml 2010-11-02 21:10:17 UTC (rev 26196)
@@ -110,16 +110,19 @@
<command
commandId="org.jboss.tools.modeshape.rest.actions.PublishCommand"
label="%publishCommand.name"
+ icon="icons/views/publish.png"
style="push">
</command>
<command
commandId="org.jboss.tools.modeshape.rest.actions.UnpublishCommand"
label="%unpublishCommand.name"
+ icon="icons/views/unpublish.png"
style="push">
</command>
<command
commandId="org.jboss.tools.modeshape.rest.actions.ShowPublishedLocationsCommand"
label="%showPublishedLocationsCommand.name"
+ icon="icons/views/blank.gif"
style="push">
</command>
<visibleWhen
13 years, 6 months
JBoss Tools SVN: r26195 - trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs.
by jbosstools-commits＠lists.jboss.org
Author: elvisisking
Date: 2010-11-02 15:23:25 -0400 (Tue, 02 Nov 2010)
New Revision: 26195
Modified:
trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs/ServerDialog.html
Log:
JBIDE-7465 Error because the Server URL was setup incorrectly. Added a label to ServerPage that gives the URL format and an example URL. Changed the screen image of ServerPage in the documentation.
Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs/ServerDialog.html
===================================================================
--- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs/ServerDialog.html 2010-11-02 19:22:53 UTC (rev 26194)
+++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs/ServerDialog.html 2010-11-02 19:23:25 UTC (rev 26195)
@@ -22,7 +22,7 @@
<table border="1">
<tr>
<td align="right"><strong>URL Field</strong> </td>
- <td>enter the server URL where one or more ModeShape repositories are hosted</td>
+ <td>enter the server URL (<code><i>protocol://host:port/context</i></code>) where one or more ModeShape repositories are hosted </td>
</tr>
<tr>
<td align="right"><strong>User Field</strong> </td>
13 years, 6 months
JBoss Tools SVN: r26194 - in trunk/modeshape/plugins/org.jboss.tools.modeshape.rest: src/org/jboss/tools/modeshape/rest and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: elvisisking
Date: 2010-11-02 15:22:53 -0400 (Tue, 02 Nov 2010)
New Revision: 26194
Modified:
trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs/images/ServerDialog.png
trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/RestClientI18n.java
trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/RestClientI18n.properties
trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/wizards/ServerPage.java
Log:
JBIDE-7465 Error because the Server URL was setup incorrectly. Added a label to ServerPage that gives the URL format and an example URL. Changed the screen image of ServerPage in the documentation.
Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/docs/images/ServerDialog.png
===================================================================
(Binary files differ)
Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/RestClientI18n.java
===================================================================
--- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/RestClientI18n.java 2010-11-02 17:39:28 UTC (rev 26193)
+++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/RestClientI18n.java 2010-11-02 19:22:53 UTC (rev 26194)
@@ -167,6 +167,7 @@
public static I18n serverPageTestConnectionDialogSuccessMsg;
public static I18n serverPageTitle;
public static I18n serverPageUrlLabel;
+ public static I18n serverPageUrlTemplateLabel;
public static I18n serverPageUrlToolTip;
public static I18n serverPageUserLabel;
public static I18n serverPageUserToolTip;
Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/RestClientI18n.properties
===================================================================
--- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/RestClientI18n.properties 2010-11-02 17:39:28 UTC (rev 26193)
+++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/RestClientI18n.properties 2010-11-02 19:22:53 UTC (rev 26194)
@@ -161,6 +161,7 @@
serverPageTestConnectionDialogSuccessMsg = Successfully connected using the specified server properties.
serverPageTitle = Enter Server Information
serverPageUrlLabel = URL:
+serverPageUrlTemplateLabel = The URL format is '<protocol>://<host>:<port>/<context>' and the default context is 'modeshape-rest'. A sample URL would be 'http://localhost:8080/modeshape-rest'.
serverPageUrlToolTip = The URL used to connect to the server
serverPageUserLabel = User:
serverPageUserToolTip = The user login used when connecting to the server
Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/wizards/ServerPage.java
===================================================================
--- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/wizards/ServerPage.java 2010-11-02 17:39:28 UTC (rev 26193)
+++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/wizards/ServerPage.java 2010-11-02 19:22:53 UTC (rev 26194)
@@ -11,10 +11,12 @@
*/
package org.jboss.tools.modeshape.rest.wizards;
+import static org.jboss.tools.modeshape.rest.IUiConstants.BLANK_IMAGE;
import static org.jboss.tools.modeshape.rest.IUiConstants.SERVER_DIALOG_HELP_CONTEXT;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.IMessageProvider;
import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.BusyIndicator;
@@ -301,6 +303,24 @@
handleUrlModified(((Text)e.widget).getText());
}
});
+
+ // add a blank image to push text over a bit
+ Label lblImage = new Label(pnl, SWT.NONE);
+ lblImage.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, false, false));
+ lblImage.setImage(Activator.getDefault().getImage(BLANK_IMAGE));
+
+ // add the text on the URL format
+ StyledText st = new StyledText(pnl, SWT.READ_ONLY | SWT.MULTI | SWT.NO_FOCUS | SWT.WRAP);
+ st.setText(RestClientI18n.serverPageUrlTemplateLabel.text());
+ st.setBackground(Display.getDefault().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND));
+ st.setFont(JFaceResources.getTextFont());
+ st.setCaret(null);
+ GridData gd = new GridData(SWT.FILL, SWT.CENTER, true, true);
+ gd.grabExcessVerticalSpace = false;
+ gd.horizontalIndent = 4;
+ gd.verticalIndent = 8;
+ gd.widthHint = 150;
+ st.setLayoutData(gd);
}
/**
13 years, 6 months
JBoss Tools SVN: r26193 - trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/view/server.
by jbosstools-commits＠lists.jboss.org
Author: bbrodt
Date: 2010-11-02 13:39:28 -0400 (Tue, 02 Nov 2010)
New Revision: 26193
Modified:
trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/view/server/BPELModuleContentProvider.java
Log:
OPEN - issue JBIDE-7486: BPELModuleContentProvider throws NPE if Servers view contains a deleted or closed module (project)
https://jira.jboss.org/browse/JBIDE-7486
Modified: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/view/server/BPELModuleContentProvider.java
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/view/server/BPELModuleContentProvider.java 2010-11-02 17:18:45 UTC (rev 26192)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/view/server/BPELModuleContentProvider.java 2010-11-02 17:39:28 UTC (rev 26193)
@@ -18,7 +18,9 @@
IModule[] module = ((ModuleServer)parentElement).module;
IModule mod = module.length > 0 ? module[module.length-1] : null;
String typeId = mod.getModuleType().getId();
- if( mod != null && typeId.equals(IBPELModuleFacetConstants.BPEL_MODULE_TYPE)) {
+ // https://jira.jboss.org/browse/JBIDE-7486
+ // if project was closed or deleted, mod.getProject() is null - ignore
+ if( mod != null && mod.getProject() != null && typeId.equals(IBPELModuleFacetConstants.BPEL_MODULE_TYPE)) {
// we have a bpel module deployed to a server. List the children
String[] versions = JBTBPELPublisher.getDeployedPathsFromDescriptor(s, mod.getProject());
return wrap((ModuleServer)parentElement, versions);
13 years, 6 months
JBoss Tools SVN: r26192 - trunk/deltacloud/tests/org.jboss.tools.deltacloud.test.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-11-02 13:18:45 -0400 (Tue, 02 Nov 2010)
New Revision: 26192
Modified:
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/InstanceMockIntegrationTest.launch
Log:
[JBIDE-7484] added tests for instance actions
Modified: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/InstanceMockIntegrationTest.launch
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/InstanceMockIntegrationTest.launch 2010-11-02 17:17:34 UTC (rev 26191)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/InstanceMockIntegrationTest.launch 2010-11-02 17:18:45 UTC (rev 26192)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
<booleanAttribute key="append.args" value="true"/>
+<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
<booleanAttribute key="askclear" value="false"/>
<booleanAttribute key="automaticAdd" value="true"/>
<booleanAttribute key="automaticValidate" value="false"/>
@@ -11,7 +12,7 @@
<booleanAttribute key="clearwslog" value="false"/>
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
<booleanAttribute key="default" value="false"/>
-<stringAttribute key="deselected_workspace_plugins" value="org.eclipse.epp.usagedata.recording,org.eclipse.epp.usagedata.gathering,org.mozilla.xulrunner.cocoa.macosx,org.jboss.tools.common,org.jboss.tools.deltacloud.docs,org.mozilla.xulrunner.gtk.linux.x86_64,org.jboss.tools.usage,org.mozilla.xulrunner.win32.win32.x86,com.jboss.jbds.usage.branding,org.jboss.tools.usage.test,org.mozilla.xulrunner.gtk.linux.x86,org.eclipse.epp.usagedata.ui,org.mozilla.xulrunner.carbon.macosx,org.mozilla.xpcom,org.jboss.tools.tests,org.jboss.tools.deltacloud.ui,org.jruby.jruby"/>
+<stringAttribute key="deselected_workspace_plugins" value="org.eclipse.epp.usagedata.recording,org.eclipse.epp.usagedata.gathering,org.mozilla.xulrunner.cocoa.macosx,org.jboss.tools.common,org.jboss.tools.deltacloud.docs,org.mozilla.xulrunner.gtk.linux.x86_64,org.jboss.tools.usage,org.jboss.tools.usage.test,org.mozilla.xulrunner.win32.win32.x86,com.jboss.jbds.usage.branding,org.mozilla.xulrunner.gtk.linux.x86,org.eclipse.epp.usagedata.ui,org.mozilla.xulrunner.carbon.macosx,org.mozilla.xpcom,org.jboss.tools.deltacloud.ui,org.jboss.tools.tests,org.jruby.jruby"/>
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
@@ -36,7 +37,7 @@
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
<booleanAttribute key="run_in_ui_thread" value="true"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.concurrent@default:default,org.apache.ant@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.apache.lucene.analysis@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.filetransfer@default:default,javax.servlet.jsp@default:default,org.apache.xml.resolver@default:default,org.eclipse.core.commands@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.equinox.security@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.emf.ecore@default:default,org.apache.lucene@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.emf.common@default:default,org.junit4@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.core.expressions@default:default,org.eclipse.wst.commo!
n.emf@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.core.databinding.observable@default:default,org.eclipse.text@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.jface.text@default:default,org.apache.jasper@default:default,org.eclipse.core.variables@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.wst.xml.core@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.wst.validation@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.team.core@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.help.ui@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.wst!
.common.environment@default:default,org.eclipse.emf.ecore.chan!
ge@defau
lt:default,org.eclipse.swtbot.ant.optional.junit3@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.swt@default:default,org.apache.xml.serializer@default:default,org.eclipse.compare@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.search@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.sdk@default:default,org.eclipse.help@default:default,javax.servlet@default:default,com.instantiations.designer.jdt.fragment@default:false,org.eclipse.core.runtime@default:true,org.eclipse.ui@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.osgi.services@default:default,org.eclipse.jem.util@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclips!
e.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.editors@default:default,org.eclipse.equinox.app@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.wst.common.core@default:default,com.ibm.icu@default:default,javax.xml@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.ui.navigator@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.update.configurator@3:true,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.jdt.core@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.jface@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.ui.views@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.compare.core@de!
fault:default,org.eclipse.jdt.ui@default:default,org.eclipse.d!
ebug.cor
e@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.ui.ide.application@default:default,org.eclipse.emf.edit@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.team.ui@default:default,org.eclipse.core.jobs@default:default,org.eclipse.ui.console@default:default,org.eclipse.core.net@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.core.resources@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.hamcrest.core@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.core.databinding@default:default,org.eclipse.help.base@default:default,org.eclipse.ant.core@default:default,org.mortbay.jetty.server@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.ltk.core.refactoring@default:default,org.apache.commons.el@default:default,org.mortbay.jetty.util@default:default,org.eclipse.debug.ui!
@default:default,org.eclipse.equinox.common@2:true,org.apache.xerces@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.registry@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.jobs@default:default,org.eclipse.swtbot.ant.optional.junit3@default:false,org.eclipse.jdt.debug@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.net@default:default,org.apache.commons.el@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.osgi@-1:true,org.eclipse.emf.edit@default:default,org.apache.ant@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.app@default:default,org.eclipse.debug.core@default:default,org.eclipse.wst.common.emfworkbench.integrati!
on@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.core.resources@default:default,org.eclipse.debug.ui@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.security@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.mortbay.jetty.util@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.core.databinding@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.apache.xml.serializer@default:default,org.eclipse.jface@default:default,org.eclipse.emf.common@default:default,org.eclipse.ui.editors@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.team.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.sdk@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.ecf.filetransfer@default:default,com.ibm.icu@default:default,org.eclipse.jface.text@default:def!
ault,org.eclipse.jem.util@default:default,org.eclipse.wst.vali!
dation@d
efault:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.search@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.jdt.core@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.text@default:default,org.eclipse.wst.sse.core@default:default,javax.xml@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,com.instantiations.designer.jdt.fragment@default:false,org.eclipse.ui.forms@default:default,org.mortbay.jetty.server@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.core.expressions@default:default,org.eclipse.osgi.util@default:default,org.eclipse.ui.navigator.resources@default:default,org.apache.jasper@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.swt@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.ui.views@default:default,org.eclipse.wst.common.pr!
oject.facet.core@default:default,org.apache.lucene.analysis@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.equinox.p2.engine@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.help.base@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.ecf@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.hamcrest.core@default:default,org.eclipse.ui.console@default:default,org.eclipse.core.commands@default:default,org.eclipse.compare.core@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.compare@default:default,org.eclipse.ui.cheatsheets@default:default,org.jboss.tools.xulrunner.initialize!
r@default:false,org.apache.lucene@default:default,org.apache.x!
ml.resol
ver@default:default,org.eclipse.help@default:default,org.eclipse.core.variables@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.team.core@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,javax.servlet@default:default,org.eclipse.equinox.common@2:true,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.wst.common.core@default:default,org.junit4@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.osgi.services@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.emf.ecore@default:default,!
org.eclipse.update.configurator@3:true,org.eclipse.help.ui@default:default,javax.servlet.jsp@default:default,org.apache.xerces@default:default,org.eclipse.ui@default:default"/>
<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.deltacloud.core@default:default,org.jboss.tools.deltacloud.test@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
13 years, 6 months
JBoss Tools SVN: r26191 - in trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test: core/client and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-11-02 13:17:34 -0400 (Tue, 02 Nov 2010)
New Revision: 26191
Modified:
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/context/MockIntegrationTestContext.java
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/InstanceMockIntegrationTest.java
Log:
[JBIDE-7484] added tests for instance actions
Modified: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/context/MockIntegrationTestContext.java
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/context/MockIntegrationTestContext.java 2010-11-02 17:12:40 UTC (rev 26190)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/context/MockIntegrationTestContext.java 2010-11-02 17:17:34 UTC (rev 26191)
@@ -19,11 +19,16 @@
import java.net.URL;
import java.net.URLConnection;
import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
import org.jboss.tools.deltacloud.core.client.DeltaCloudClient;
import org.jboss.tools.deltacloud.core.client.DeltaCloudClientException;
import org.jboss.tools.deltacloud.core.client.Image;
import org.jboss.tools.deltacloud.core.client.Instance;
+import org.jboss.tools.deltacloud.core.client.Instance.State;
/**
* A class that holds the integration test context
@@ -41,6 +46,8 @@
private DeltaCloudClient client;
private Instance testInstance;
+ private ExecutorService executor = Executors.newSingleThreadExecutor();
+
public void setUp() throws IOException, DeltaCloudClientException {
ensureDeltaCloudIsRunning();
this.client = new DeltaCloudClient(DELTACLOUD_URL, DELTACLOUD_USER, DELTACLOUD_PASSWORD);
@@ -53,7 +60,7 @@
Instance instance = client.createInstance(image.getId());
return instance;
}
-
+
public void ensureDeltaCloudIsRunning() throws IOException {
try {
URLConnection connection = new URL(DELTACLOUD_URL).openConnection();
@@ -62,7 +69,7 @@
fail("Local DeltaCloud instance is not running. Please start a DeltaCloud instance before running these tests.");
}
}
-
+
public DeltaCloudClient getClient() {
return client;
}
@@ -77,7 +84,6 @@
Image image = images.get(0);
return image;
}
-
public Instance getInstanceById(String id, DeltaCloudClient client) throws DeltaCloudClientException {
for (Instance availableInstance : client.listInstances()) {
@@ -87,11 +93,12 @@
}
return null;
}
-
+
public void tearDown() {
quietlyDestroyInstance(testInstance);
+ executor.shutdownNow();
}
-
+
public void quietlyDestroyInstance(Instance instance) {
if (instance != null) {
try {
@@ -101,4 +108,41 @@
}
}
}
+
+ /**
+ * Waits for an instance to get the given state for a given timeout.
+ *
+ * @param instanceId
+ * the id of the instance to watch
+ * @param state
+ * the state to wait for
+ * @param timeout
+ * the timeout to wait for
+ * @return <code>true</code>, if the state was reached while waiting for
+ * timeout, <code>false</code> otherwise
+ * @throws ExecutionException
+ * @throws InterruptedException
+ */
+ public boolean waitForInstanceState(final String instanceId, final State state, final long timeout) throws InterruptedException, ExecutionException {
+ final long startTime = System.currentTimeMillis();
+ Callable<Boolean> waitingCallable = new Callable<Boolean>() {
+
+ @Override
+ public Boolean call() throws Exception {
+ try {
+ while (System.currentTimeMillis() < startTime + timeout) {
+ if (client.listInstances(instanceId).getState() == state) {
+ return true;
+ }
+ Thread.sleep(200);
+ }
+ return false;
+ } catch (Exception e) {
+ e.printStackTrace();
+ return false;
+ }
+ }
+ };
+ return executor.submit(waitingCallable).get();
+ }
}
Modified: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/InstanceMockIntegrationTest.java
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/InstanceMockIntegrationTest.java 2010-11-02 17:12:40 UTC (rev 26190)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/InstanceMockIntegrationTest.java 2010-11-02 17:17:34 UTC (rev 26191)
@@ -11,6 +11,7 @@
package org.jboss.tools.internal.deltacloud.test.core.client;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
@@ -18,15 +19,18 @@
import java.io.IOException;
import java.net.MalformedURLException;
import java.util.List;
+import java.util.concurrent.ExecutionException;
import org.jboss.tools.deltacloud.core.client.DeltaCloudClient;
import org.jboss.tools.deltacloud.core.client.DeltaCloudClientException;
import org.jboss.tools.deltacloud.core.client.Image;
import org.jboss.tools.deltacloud.core.client.Instance;
-import org.jboss.tools.deltacloud.core.client.Instance.InstanceState;
+import org.jboss.tools.deltacloud.core.client.Instance.Action;
+import org.jboss.tools.deltacloud.core.client.Instance.State;
import org.jboss.tools.internal.deltacloud.test.context.MockIntegrationTestContext;
import org.junit.After;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
/**
@@ -61,6 +65,7 @@
* @throws DeltaCloudClientException
* the delta cloud client exception
*/
+ @Ignore
@Test
public void listContainsTestInstance() throws DeltaCloudClientException {
DeltaCloudClient client = testSetup.getClient();
@@ -70,6 +75,7 @@
assertNotNull(testSetup.getInstanceById(testInstance.getId(), client));
}
+ @Ignore
@Test
public void listTestInstance() throws DeltaCloudClientException {
Instance instance = testSetup.getClient().listInstances(testSetup.getTestInstance().getId());
@@ -88,6 +94,7 @@
, instance);
}
+ @Ignore
@Test(expected = DeltaCloudClientException.class)
public void listDestroyedInstanceThrowsException() throws DeltaCloudClientException {
Instance testInstance = testSetup.getTestInstance();
@@ -107,6 +114,7 @@
assertTrue(publicAddresses.equals(instance.getPublicAddresses()));
}
+ @Ignore
@Test(expected = DeltaCloudClientException.class)
public void cannotDestroyIfNotAuthenticated() throws MalformedURLException, DeltaCloudClientException {
DeltaCloudClient unauthenticatedClient = new DeltaCloudClient(MockIntegrationTestContext.DELTACLOUD_URL,
@@ -115,6 +123,7 @@
unauthenticatedClient.createInstance(image.getId());
}
+ @Ignore
@Test
public void canCreateInstance() throws DeltaCloudClientException {
Instance instance = null;
@@ -123,7 +132,7 @@
instance = testSetup.getClient().createInstance(image.getId());
assertTrue(instance != null);
assertEquals(image.getId(), instance.getImageId());
- assertEquals(InstanceState.RUNNING, instance.getState());
+ assertEquals(State.RUNNING, instance.getState());
} finally {
testSetup.quietlyDestroyInstance(instance);
}
@@ -134,6 +143,7 @@
testSetup.getClient().createInstance("dummy");
}
+ @Ignore
@Test
public void canDestroy() throws DeltaCloudClientException {
Image image = testSetup.getFirstImage(testSetup.getClient());
@@ -142,29 +152,88 @@
assertNull(testSetup.getInstanceById(instance.getId(), testSetup.getClient()));
}
+ @Ignore
@Test(expected = DeltaCloudClientException.class)
public void destroyThrowExceptionOnUnknowInstanceId() throws DeltaCloudClientException {
testSetup.getClient().destroyInstance("dummy");
}
+ @Ignore
@Test
public void canShutdownInstance() throws DeltaCloudClientException {
Instance testInstance = testSetup.getTestInstance();
DeltaCloudClient client = testSetup.getClient();
client.shutdownInstance(testInstance.getId());
testInstance = client.listInstances(testInstance.getId()); // reload!
- assertEquals(InstanceState.STOPPED, testInstance.getState());
+ assertEquals(State.STOPPED, testInstance.getState());
}
+ @Ignore
@Test
public void canStartInstance() throws DeltaCloudClientException {
Instance testInstance = testSetup.getTestInstance();
DeltaCloudClient client = testSetup.getClient();
- if (testInstance.getState() == InstanceState.RUNNING) {
+ if (testInstance.getState() == State.RUNNING) {
client.shutdownInstance(testInstance.getId());
}
client.startInstance(testInstance.getId());
testInstance = client.listInstances(testInstance.getId()); // reload!
- assertEquals(InstanceState.RUNNING, testInstance.getState());
+ assertEquals(State.RUNNING, testInstance.getState());
}
+
+ @Test
+ public void canStartInstanceByAction() throws DeltaCloudClientException {
+ Instance testInstance = testSetup.getTestInstance();
+ DeltaCloudClient client = testSetup.getClient();
+ if (testInstance.getState() == State.RUNNING) {
+ client.performInstanceAction(testInstance.getId(), Action.STOP.toString());
+ }
+ assertTrue(client.performInstanceAction(testInstance.getId(), Action.START.toString()));
+ testInstance = client.listInstances(testInstance.getId()); // reload!
+ assertEquals(State.RUNNING, testInstance.getState());
+ }
+
+ @Test
+ public void cannotStartRunningInstance() throws DeltaCloudClientException {
+ Instance testInstance = testSetup.getTestInstance();
+ DeltaCloudClient client = testSetup.getClient();
+ client.startInstance(testInstance.getId());
+ assertFalse(client.performInstanceAction(testInstance.getId(), Action.START.toString()));
+ }
+
+ @Test
+ public void cannotStopStoppedInstance() throws DeltaCloudClientException {
+ Instance testInstance = testSetup.getTestInstance();
+ DeltaCloudClient client = testSetup.getClient();
+ try {
+ client.shutdownInstance(testInstance.getId());
+ assertFalse(client.performInstanceAction(testInstance.getId(), Action.STOP.toString()));
+ } finally {
+ client.startInstance(testInstance.getId());
+ }
+ }
+
+ @Test
+ public void cannotDestroyRunningInstance() throws DeltaCloudClientException {
+ Instance testInstance = testSetup.getTestInstance();
+ DeltaCloudClient client = testSetup.getClient();
+ testInstance = client.listInstances(testInstance.getId()); // reload
+ assertTrue(testInstance.getState() == State.RUNNING);
+ assertFalse(client.performInstanceAction(testInstance.getId(), Action.DESTROY.toString()));
+ }
+
+ @Test
+ public void cannotRebootStoppedInstance() throws DeltaCloudClientException, InterruptedException, ExecutionException {
+ Instance testInstance = testSetup.getTestInstance();
+ DeltaCloudClient client = testSetup.getClient();
+ try {
+ client.shutdownInstance(testInstance.getId());
+ testInstance = client.listInstances(testInstance.getId()); // reload
+ assertTrue(testInstance.getState() == State.STOPPED);
+ assertFalse(client.performInstanceAction(testInstance.getId(), Action.REBOOT.toString()));
+ } finally {
+ client.startInstance(testInstance.getId());
+ client.listInstances(testInstance.getId()); // reload
+ }
+ }
}
13 years, 6 months
JBoss Tools SVN: r26190 - workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/view/server.
by jbosstools-commits＠lists.jboss.org
Author: bbrodt
Date: 2010-11-02 13:12:40 -0400 (Tue, 02 Nov 2010)
New Revision: 26190
Modified:
workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/view/server/BPELModuleContentProvider.java
Log:
OPEN - issue JBIDE-7486: BPELModuleContentProvider throws NPE if Servers view contains a deleted or closed module (project)
https://jira.jboss.org/browse/JBIDE-7486
Modified: workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/view/server/BPELModuleContentProvider.java
===================================================================
--- workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/view/server/BPELModuleContentProvider.java 2010-11-02 15:19:52 UTC (rev 26189)
+++ workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/view/server/BPELModuleContentProvider.java 2010-11-02 17:12:40 UTC (rev 26190)
@@ -19,7 +19,9 @@
IModule[] module = ((ModuleServer)parentElement).module;
IModule mod = module.length > 0 ? module[module.length-1] : null;
String typeId = mod.getModuleType().getId();
- if( mod != null && (typeId.equals(IBPELModuleFacetConstants.BPEL20_MODULE_TYPE) || typeId.equals(JBTBPELModuleFactoryDelegate.LEGACY_MODULE_TYPE))) {
+ // https://jira.jboss.org/browse/JBIDE-7486
+ // if project was closed or deleted, mod.getProject() is null - ignore
+ if( mod != null && mod.getProject() != null && (typeId.equals(IBPELModuleFacetConstants.BPEL20_MODULE_TYPE) || typeId.equals(JBTBPELModuleFactoryDelegate.LEGACY_MODULE_TYPE))) {
// we have a bpel module deployed to a server. List the children
String[] versions = JBTBPELPublisher.getDeployedPathsFromDescriptor(s, mod.getProject());
return wrap((ModuleServer)parentElement, versions);
13 years, 6 months
JBoss Tools SVN: r26189 - trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src.
by jbosstools-commits＠lists.jboss.org
Author: elvisisking
Date: 2010-11-02 11:19:52 -0400 (Tue, 02 Nov 2010)
New Revision: 26189
Modified:
trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/log4j.properties
Log:
JBIDE-7466 errors are written to stdout of shell from which it invoked. Removed the console logger from the log4j.properties. Also changed the logging from TRACE to INFO. This should take care of the trace logging that was being done by ModeShape Tools to the console.
Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/log4j.properties
===================================================================
--- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/log4j.properties 2010-11-02 14:34:03 UTC (rev 26188)
+++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/log4j.properties 2010-11-02 15:19:52 UTC (rev 26189)
@@ -11,18 +11,11 @@
#
# Root logger option
-log4j.rootLogger=TRACE, LOGFILE, CONSOLE
+log4j.rootLogger=INFO, LOGFILE
log4j.appender.LOGFILE=org.apache.log4j.FileAppender
log4j.appender.LOGFILE.File=eclipse.log
log4j.appender.LOGFILE.Append=true
-log4j.appender.LOGFILE.Threshold=TRACE
+log4j.appender.LOGFILE.Threshold=INFO
log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout
log4j.appender.LOGFILE.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
-
-# CONSOLE
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.Target=System.out
-log4j.appender.CONSOLE.Threshold=TRACE
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=- %m%n
13 years, 6 months
JBoss Tools SVN: r26188 - in trunk/common/plugins/org.jboss.tools.common.projecttemplates: lib/RichFaces4.0 and 16 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-11-02 10:34:03 -0400 (Tue, 02 Nov 2010)
New Revision: 26188
Added:
trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/RichFaces4.0/
trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/RichFaces4.0/cssparser-0.9.5.jar
trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/RichFaces4.0/ehcache-1.6.0.jar
trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/RichFaces4.0/richfaces-components-api-4.0.0.20101004-M3.jar
trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/RichFaces4.0/richfaces-components-ui-4.0.0.20101004-M3.jar
trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/RichFaces4.0/richfaces-core-api-4.0.0.20101004-M3.jar
trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/RichFaces4.0/richfaces-core-impl-4.0.0.20101004-M3.jar
trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/RichFaces4.0/sac-1.3.jar
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/.preprocessing
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/.settings/
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/.settings/org.jboss.tools.jst.web.xml
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/JavaSource/
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/JavaSource/demo/
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/JavaSource/demo/User.java
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/JavaSource/resources.properties
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/META-INF/
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/META-INF/MANIFEST.MF
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/WEB-INF/
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/WEB-INF/.faces-config.xml.jsfdia
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/WEB-INF/classes/
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/WEB-INF/classes/demo/
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/WEB-INF/classes/demo/User.class
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/WEB-INF/classes/resources.properties
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/WEB-INF/faces-config.xml
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/WEB-INF/lib/
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/WEB-INF/web.xml
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/index.html
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/pages/
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/pages/greeting.xhtml
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/pages/inputname.xhtml
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/resources/
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/resources/demo/
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/resources/demo/input.xhtml
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/templates/
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/templates/common.xhtml
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/ant/
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/ant/build.properties
Modified:
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/JSFVersions.xml
Log:
JBIDE-7422
https://jira.jboss.org/browse/JBIDE-7422
Added: trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/RichFaces4.0/cssparser-0.9.5.jar
===================================================================
(Binary files differ)
Property changes on: trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/RichFaces4.0/cssparser-0.9.5.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/RichFaces4.0/ehcache-1.6.0.jar
===================================================================
(Binary files differ)
Property changes on: trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/RichFaces4.0/ehcache-1.6.0.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/RichFaces4.0/richfaces-components-api-4.0.0.20101004-M3.jar
===================================================================
(Binary files differ)
Property changes on: trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/RichFaces4.0/richfaces-components-api-4.0.0.20101004-M3.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/RichFaces4.0/richfaces-components-ui-4.0.0.20101004-M3.jar
===================================================================
(Binary files differ)
Property changes on: trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/RichFaces4.0/richfaces-components-ui-4.0.0.20101004-M3.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/RichFaces4.0/richfaces-core-api-4.0.0.20101004-M3.jar
===================================================================
(Binary files differ)
Property changes on: trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/RichFaces4.0/richfaces-core-api-4.0.0.20101004-M3.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/RichFaces4.0/richfaces-core-impl-4.0.0.20101004-M3.jar
===================================================================
(Binary files differ)
Property changes on: trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/RichFaces4.0/richfaces-core-impl-4.0.0.20101004-M3.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/RichFaces4.0/sac-1.3.jar
===================================================================
(Binary files differ)
Property changes on: trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/RichFaces4.0/sac-1.3.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/JSFVersions.xml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/JSFVersions.xml 2010-11-02 14:29:56 UTC (rev 26187)
+++ trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/JSFVersions.xml 2010-11-02 14:34:03 UTC (rev 26188)
@@ -23,4 +23,10 @@
<refLib type="servlet" location="../servlet" />
<projectTempl location="./jsf-2.0" />
</version>
+ <version displayName="JSF 2.0 & RichFaces 4.0" servlet-version="3.0">
+ <lib type="core" location="../lib/jsf-1.2"/>
+ <lib type="common" location="../lib/RichFaces4.0" />
+ <refLib type="servlet" location="../servlet" />
+ <projectTempl location="./jsf-2.0-RichFaces-4.0" />
+ </version>
</versions>
\ No newline at end of file
Added: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/.preprocessing
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/.preprocessing (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/.preprocessing 2010-11-02 14:34:03 UTC (rev 26188)
@@ -0,0 +1 @@
+WebContent/WEB-INF/web.xml
Added: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/.settings/org.jboss.tools.jst.web.xml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/.settings/org.jboss.tools.jst.web.xml (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/.settings/org.jboss.tools.jst.web.xml 2010-11-02 14:34:03 UTC (rev 26188)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<file-systems application-name="" model-entity="FileSystems" WORKSPACE_HOME="./WebContent/WEB-INF">
+ <file-system model-entity="FileSystemFolder" location="%workspace.home%" NAME="WEB-INF"/>
+ <file-system model-entity="FileSystemFolder" INFO="Content-Type=Web"
+ location="%workspace.home%/.." NAME="WEB-ROOT"/>
+ <file-system model-entity="FileSystemFolder"
+ location="%workspace.home%/../../JavaSource" NAME="src"/>
+ <file-system model-entity="FileSystemFolder"
+ location="%workspace.home%/lib" NAME="lib"/>
+ <file-system model-entity="FileSystemFolder"
+ location="%workspace.home%/classes" NAME="classes"/>
+ <file-system model-entity="FileSystemFolder"
+ location="%workspace.home%/../../ant" NAME="build"/>
+ <WEB model-entity="JstWeb" MODEL_PATH="/web.xml">
+ <MODULE model-entity="WebJSFModule" MODEL_PATH="/faces-config.xml"
+ ROOT="WEB-ROOT" SRC="src" URI="/WEB-INF/faces-config.xml"/>
+ </WEB>
+</file-systems>
Property changes on: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/.settings/org.jboss.tools.jst.web.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/JavaSource/demo/User.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/JavaSource/demo/User.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/JavaSource/demo/User.java 2010-11-02 14:34:03 UTC (rev 26188)
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package demo;
+
+import javax.faces.bean.ManagedBean;
+import javax.faces.bean.SessionScoped;
+
+/**
+ * Created by JBoss Tools
+ */
+@ManagedBean(name="user")
+@SessionScoped
+public class User {
+ private String name;
+
+ public User() {
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String sayHello() {
+ return "greeting";
+ }
+}
\ No newline at end of file
Property changes on: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/JavaSource/demo/User.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/JavaSource/resources.properties
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/JavaSource/resources.properties (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/JavaSource/resources.properties 2010-11-02 14:34:03 UTC (rev 26188)
@@ -0,0 +1,2 @@
+prompt=Your Name\:
+greeting=Hello
Property changes on: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/JavaSource/resources.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/META-INF/MANIFEST.MF (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/META-INF/MANIFEST.MF 2010-11-02 14:34:03 UTC (rev 26188)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Property changes on: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/META-INF/MANIFEST.MF
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/WEB-INF/.faces-config.xml.jsfdia
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/WEB-INF/.faces-config.xml.jsfdia (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/WEB-INF/.faces-config.xml.jsfdia 2010-11-02 14:34:03 UTC (rev 26188)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PROCESS model-entity="JSFProcess">
+ <PROCESS-ITEM NAME="rules:#pages#greeting.xhtml"
+ PATH="/pages/greeting.xhtml" SHAPE="240,33,0,0" model-entity="JSFProcessGroup"/>
+ <PROCESS-ITEM NAME="rules:#pages#inputname.xhtml"
+ PATH="/pages/inputname.xhtml" SHAPE="32,17,0,0" model-entity="JSFProcessGroup">
+ <PROCESS-ITEM ID="rules:#pages#inputname.xhtml:0" NAME="item"
+ PATH="/pages/inputname.xhtml" model-entity="JSFProcessItem">
+ <PROCESS-ITEM-OUTPUT ID="greeting::#pages#greeting.xhtml"
+ NAME="output" PATH="/pages/greeting.xhtml"
+ TARGET="rules:#pages#greeting.xhtml" TITLE="greeting" model-entity="JSFProcessItemOutput"/>
+ </PROCESS-ITEM>
+ </PROCESS-ITEM>
+</PROCESS>
Added: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/WEB-INF/classes/demo/User.class
===================================================================
(Binary files differ)
Property changes on: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/WEB-INF/classes/demo/User.class
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/WEB-INF/classes/resources.properties
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/WEB-INF/classes/resources.properties (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/WEB-INF/classes/resources.properties 2010-11-02 14:34:03 UTC (rev 26188)
@@ -0,0 +1,2 @@
+prompt=Your Name\:
+greeting=Hello
Property changes on: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/WEB-INF/classes/resources.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/WEB-INF/faces-config.xml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/WEB-INF/faces-config.xml (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/WEB-INF/faces-config.xml 2010-11-02 14:34:03 UTC (rev 26188)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<faces-config
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
+ version="2.0">
+
+ <navigation-rule>
+ <from-view-id>/pages/inputname.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>greeting</from-outcome>
+ <to-view-id>/pages/greeting.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+
+ <application>
+ <resource-bundle>
+ <base-name>resources</base-name>
+ <var>msgs</var>
+ </resource-bundle>
+ </application>
+</faces-config>
\ No newline at end of file
Property changes on: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/WEB-INF/faces-config.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/WEB-INF/web.xml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/WEB-INF/web.xml (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/WEB-INF/web.xml 2010-11-02 14:34:03 UTC (rev 26188)
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+#if ($servlet_version == "2.4")
+<web-app version="2.4"
+xmlns="http://java.sun.com/xml/ns/j2ee"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+#elseif ($servlet_version == "2.5")
+<web-app version="2.5"
+xmlns="http://java.sun.com/xml/ns/javaee"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+#elseif ($servlet_version == "3.0")
+<web-app version="3.0"
+xmlns="http://java.sun.com/xml/ns/javaee"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+#else
+<!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+#end
+
+ <display-name>${project.name}</display-name>
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>*.jsf</url-pattern>
+ <url-pattern>/faces/*</url-pattern>
+ </servlet-mapping>
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ <welcome-file>index.htm</welcome-file>
+ <welcome-file>index.jsp</welcome-file>
+ <welcome-file>default.html</welcome-file>
+ <welcome-file>default.htm</welcome-file>
+ <welcome-file>default.jsp</welcome-file>
+ </welcome-file-list>
+</web-app>
\ No newline at end of file
Property changes on: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/WEB-INF/web.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/index.html
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/index.html (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/index.html 2010-11-02 14:34:03 UTC (rev 26188)
@@ -0,0 +1 @@
+<html><head><meta http-equiv="Refresh" content="0; URL=pages/inputname.jsf"/></head></html>
Property changes on: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/index.html
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/pages/greeting.xhtml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/pages/greeting.xhtml (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/pages/greeting.xhtml 2010-11-02 14:34:03 UTC (rev 26188)
@@ -0,0 +1,14 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
+
+ <ui:composition template="/templates/common.xhtml">
+ <ui:define name="pageTitle">Greeting to User</ui:define>
+ <ui:define name="pageHeader">Greeting Page</ui:define>
+ <ui:define name="body">
+ #{msgs.greeting} #{user.name}!
+ </ui:define>
+ </ui:composition>
+</html>
\ No newline at end of file
Property changes on: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/pages/greeting.xhtml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/pages/inputname.xhtml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/pages/inputname.xhtml (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/pages/inputname.xhtml 2010-11-02 14:34:03 UTC (rev 26188)
@@ -0,0 +1,19 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ez="http://java.sun.com/jsf/composite/demo">
+
+ <ui:composition template="/templates/common.xhtml">
+
+ <ui:define name="pageTitle">Input User Name</ui:define>
+
+ <ui:define name="pageHeader">RichFaces 4.0 Hello Application</ui:define>
+
+ <ui:define name="body">
+ <h:message showSummary="true" showDetail="false" style="color: red; font-weight: bold;" for="inputname" />
+ <ez:input id="inputname" label="${msgs.prompt}" value="#{user.name}" action="#{user.sayHello}" submitlabel="Say Hello"/>
+ </ui:define>
+ </ui:composition>
+</html>
\ No newline at end of file
Property changes on: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/pages/inputname.xhtml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/resources/demo/input.xhtml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/resources/demo/input.xhtml (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/resources/demo/input.xhtml 2010-11-02 14:34:03 UTC (rev 26188)
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:composite="http://java.sun.com/jsf/composite">
+
+ <composite:interface>
+ <composite:attribute name="label"/>
+ <composite:attribute name="value" required="true"/>
+ <composite:attribute name="action" required="true" method-signature="java.lang.String f()"/>
+ <composite:attribute name="submitlabel"/>
+ </composite:interface>
+
+ <composite:implementation>
+ <h:form>
+ <h:panelGrid columns="3">
+ <h:outputText value="#{cc.attrs.label}" />
+ <h:inputText value="#{cc.attrs.value}"/>
+ <h:commandButton action="#{cc.attrs.action}" value="#{cc.attrs.submitlabel}" />
+ </h:panelGrid>
+ </h:form>
+ </composite:implementation>
+</html>
\ No newline at end of file
Property changes on: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/resources/demo/input.xhtml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/templates/common.xhtml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/templates/common.xhtml (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/templates/common.xhtml 2010-11-02 14:34:03 UTC (rev 26188)
@@ -0,0 +1,23 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:rich="http://richfaces.org/rich">
+
+ <h:head>
+ <title><ui:insert name="pageTitle">Page Title</ui:insert></title>
+ </h:head>
+
+ <h:body style="text-align: center;">
+ <div align="center">
+ <rich:panel style="width:400px;">
+ <f:facet name="header">
+ <ui:insert name="pageHeader">Page Header</ui:insert>
+ </f:facet>
+ <ui:insert name="body">Page Body</ui:insert>
+ </rich:panel>
+ </div>
+ </h:body>
+
+</html>
\ No newline at end of file
Property changes on: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/WebContent/templates/common.xhtml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/ant/build.properties
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/ant/build.properties (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/ant/build.properties 2010-11-02 14:34:03 UTC (rev 26188)
@@ -0,0 +1,3 @@
+#
+#Fri Oct 29 18:36:59 MSD 2010
+classpath.external=
Property changes on: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-2.0-RichFaces-4.0/RichFaces/ant/build.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
13 years, 6 months
JBoss Tools SVN: r26187 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates.
by jbosstools-commits＠lists.jboss.org
Author: dvinnichek
Date: 2010-11-02 10:29:56 -0400 (Tue, 02 Nov 2010)
New Revision: 26187
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml
Log:
added templates for rich functions (https://jira.jboss.org/browse/JBIDE-7447)
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml 2010-11-02 14:04:08 UTC (rev 26186)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml 2010-11-02 14:29:56 UTC (rev 26187)
@@ -804,5 +804,25 @@
</vpe:dnd>
</vpe:template>
</vpe:tag>
+ <vpe:tag name="rich:clientId" case-sensitive="yes">
+ <vpe:template children="no" modify="no">
+ </vpe:template>
+ </vpe:tag>
+ <vpe:tag name="rich:component" case-sensitive="yes">
+ <vpe:template children="no" modify="no">
+ </vpe:template>
+ </vpe:tag>
+ <vpe:tag name="rich:element" case-sensitive="yes">
+ <vpe:template children="no" modify="no">
+ </vpe:template>
+ </vpe:tag>
+ <vpe:tag name="rich:findComponent" case-sensitive="yes">
+ <vpe:template children="no" modify="no">
+ </vpe:template>
+ </vpe:tag>
+ <vpe:tag name="rich:isUserInRole" case-sensitive="yes">
+ <vpe:template children="no" modify="no">
+ </vpe:template>
+ </vpe:tag>
</vpe:templates>
13 years, 6 months