JBoss Tools SVN: r32032 - trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-06-10 18:53:38 -0400 (Fri, 10 Jun 2011)
New Revision: 32032
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEHostShellModel.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java
Log:
[JBIDE-9054] corrected warnings
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEHostShellModel.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEHostShellModel.java 2011-06-10 22:49:15 UTC (rev 32031)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEHostShellModel.java 2011-06-10 22:53:38 UTC (rev 32032)
@@ -27,10 +27,7 @@
import org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem.IShellServiceSubSystem;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.ServerCore;
-import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger;
-import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior;
-import org.jboss.ide.eclipse.as.core.util.ServerConverter;
import org.jboss.ide.eclipse.as.rse.core.xpl.ConnectAllSubsystemsUtil;
public class RSEHostShellModel {
@@ -141,11 +138,6 @@
}
}
- private static DeployableServerBehavior getBehaviour(String serverId) {
- IServer s = ServerCore.findServer(serverId);
- return s == null ? null : ServerConverter.getDeployableServerBehavior(s);
- }
-
public static IShellService findShellService(JBossServerBehavior behaviour) throws CoreException {
return findShellService(behaviour.getServer());
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java 2011-06-10 22:49:15 UTC (rev 32031)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java 2011-06-10 22:53:38 UTC (rev 32032)
@@ -37,11 +37,9 @@
import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior;
-import org.jboss.ide.eclipse.as.core.server.internal.launch.AbstractJBossLaunchConfigType;
import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration;
import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration.IStartLaunchSetupParticipant;
import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration.StartLaunchDelegate;
-import org.jboss.ide.eclipse.as.core.server.internal.launch.LocalJBossServerStartupLaunchUtil;
import org.jboss.ide.eclipse.as.core.server.internal.launch.StopLaunchConfiguration;
import org.jboss.ide.eclipse.as.core.util.ArgsUtil;
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants;
@@ -199,8 +197,10 @@
JBossServer jbs = ServerConverter.getJBossServer(server);
- IJBossRuntimeResourceConstants c = new IJBossRuntimeResourceConstants(){};
- String stop = new Path(rseHome).append(c.BIN).append(c.SHUTDOWN_SH).toString() + IJBossRuntimeConstants.SPACE;
+ String stop = new Path(rseHome)
+ .append(IJBossRuntimeResourceConstants.BIN)
+ .append(IJBossRuntimeResourceConstants.SHUTDOWN_SH).toString()
+ + IJBossRuntimeConstants.SPACE;
// Pull args from single utility method
stop += StopLaunchConfiguration.getDefaultArgs(jbs);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java 2011-06-10 22:49:15 UTC (rev 32031)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java 2011-06-10 22:53:38 UTC (rev 32032)
@@ -21,12 +21,11 @@
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.IServerAttributes;
import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
-import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.util.IConstants;
+import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
@@ -85,7 +84,7 @@
String loc = IConstants.SERVER;
String config = getRSEConfigName(server);
IPath p = new Path(loc).append(config)
- .append(IJBossServerConstants.DEPLOY);
+ .append(IJBossRuntimeResourceConstants.DEPLOY);
return makeGlobal(server, p).toString();
}
}
14 years, 10 months
- 1
- 0
JBoss Tools SVN: r32031 - in trunk/deltacloud/plugins: org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-06-10 18:49:15 -0400 (Fri, 10 Jun 2011)
New Revision: 32031
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/META-INF/MANIFEST.MF
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateServerFromRSEJob.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/META-INF/MANIFEST.MF
Log:
corrected warnings in org.jboss.tools.deltacloud.integration
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/META-INF/MANIFEST.MF 2011-06-10 22:41:07 UTC (rev 32030)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/META-INF/MANIFEST.MF 2011-06-10 22:49:15 UTC (rev 32031)
@@ -13,7 +13,7 @@
Export-Package: org.apache.deltacloud.client;x-friends:="org.jboss.tools.deltacloud.integration,org.jboss.tools.deltacloud.test",
org.apache.deltacloud.client.utils;x-friends:="org.jboss.tools.deltacloud.test,org.jboss.tools.deltacloud.ui",
org.jboss.tools.deltacloud.core;x-friends:="org.jboss.tools.deltacloud.ui,org.jboss.tools.deltacloud.test,org.jboss.tools.deltacloud.integration",
- org.jboss.tools.deltacloud.core.job;x-friends:="org.jboss.tools.deltacloud.ui,org.jboss.tools.deltacloud.test",
+ org.jboss.tools.deltacloud.core.job;x-friends:="org.jboss.tools.deltacloud.ui,org.jboss.tools.deltacloud.test,org.jboss.tools.deltacloud.integration",
org.jboss.tools.internal.deltacloud.core.observable;x-friends:="org.jboss.tools.deltacloud.ui"
Bundle-ClassPath: client-0.2.0-SNAPSHOT.jar,
.
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateServerFromRSEJob.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateServerFromRSEJob.java 2011-06-10 22:41:07 UTC (rev 32030)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateServerFromRSEJob.java 2011-06-10 22:49:15 UTC (rev 32031)
@@ -41,8 +41,8 @@
import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.IServerType;
+import org.eclipse.wst.server.core.IServerWorkingCopy;
import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.internal.ServerWorkingCopy;
import org.jboss.ide.eclipse.as.core.server.internal.DeployableServer;
import org.jboss.ide.eclipse.as.core.util.ServerCreationUtils;
import org.jboss.ide.eclipse.as.rse.core.RSEUtils;
@@ -289,7 +289,7 @@
String serverName) throws CoreException {
IRuntime rt = findOrCreateStubDeployOnlyRuntime();
IServerType st = ServerCore.findServerType("org.jboss.ide.eclipse.as.systemCopyServer");
- ServerWorkingCopy swc = (ServerWorkingCopy) st.createServer(serverName, null, null);
+ IServerWorkingCopy swc = (IServerWorkingCopy) st.createServer(serverName, null, null);
swc.setServerConfiguration(null);
swc.setName(serverName);
swc.setRuntime(rt);
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/META-INF/MANIFEST.MF 2011-06-10 22:41:07 UTC (rev 32030)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/META-INF/MANIFEST.MF 2011-06-10 22:49:15 UTC (rev 32031)
@@ -28,4 +28,4 @@
Export-Package: org.jboss.tools.deltacloud.ui,
org.jboss.tools.deltacloud.ui.preferences,
org.jboss.tools.deltacloud.ui.wizard,
- org.jboss.tools.internal.deltacloud.ui.utils;x-friends:="org.jboss.tools.deltacloud.test"
+ org.jboss.tools.internal.deltacloud.ui.utils;x-friends:="org.jboss.tools.deltacloud.test,org.jboss.tools.deltacloud.integration"
14 years, 10 months
- 1
- 0
JBoss Tools SVN: r32030 - trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-06-10 18:41:07 -0400 (Fri, 10 Jun 2011)
New Revision: 32030
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java
Log:
[JBIDE-9054] made code more readable: 1) transformed "if"s into "else if"s and switched the type checked so that it gets null-safe if the type is null
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java 2011-06-10 22:14:45 UTC (rev 32029)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java 2011-06-10 22:41:07 UTC (rev 32030)
@@ -61,7 +61,7 @@
/* Copied from JBossServer.getDeployFolder(etc) */
public static String getDeployRootFolder(IServer server, String type) {
- if( type.equals(JBossServer.DEPLOY_CUSTOM)) {
+ if( JBossServer.DEPLOY_CUSTOM.equals(type)) {
String val = server.getAttribute(JBossServer.DEPLOY_DIRECTORY, (String)null);
if( val != null ) {
IPath val2 = new Path(val);
@@ -71,10 +71,10 @@
type = JBossServer.DEPLOY_SERVER;
}
// This should *NOT* happen, so if it does, we will default to server location
- if( type.equals(JBossServer.DEPLOY_METADATA)) {
+ else if( JBossServer.DEPLOY_METADATA.equals(type)) {
type = JBossServer.DEPLOY_SERVER;
}
- if( type.equals(JBossServer.DEPLOY_SERVER)) {
+ else if(JBossServer.DEPLOY_SERVER.equals(type)) {
// TODO !!!! Need API (nmaybe in JBossServer?) so servers can override this behavior
// Cannot move this code to JBossServer because this requires an RSE-specific key!! Damn!
14 years, 10 months
- 1
- 0
JBoss Tools SVN: r32029 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-06-10 18:14:45 -0400 (Fri, 10 Jun 2011)
New Revision: 32029
Modified:
trunk/build/publish.sh
Log:
track GIT revision if available
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2011-06-10 21:48:07 UTC (rev 32028)
+++ trunk/build/publish.sh 2011-06-10 22:14:45 UTC (rev 32029)
@@ -60,9 +60,13 @@
rm -f ${rl}.txt ${rl}.xml; wget -O ${rl}.xml "http://hudson.qa.jboss.com/hudson/job/${JOB_NAME}/api/xml?wrapper=changeS..." --timeout=900 --wait=10 --random-wait --tries=30 --retry-connrefused --no-check-certificate --server-response
if [[ $? -gt 0 ]]; then
rm -f ${rl}.txt ${rl}.xml; wget -O ${rl}.xml "http://hudson.qa.jboss.com/hudson/job/${JOB_NAME}/config.xml" --timeout=900 --wait=10 --random-wait --tries=30 --retry-connrefused --no-check-certificate --server-response
- # TODO: track git source revision if available through hudson api
- if [[ $(cat ${rl}.xml | grep "git" ]]; then
+ if [[ $(cat ${rl}.xml | grep "git") ]]; then
echo "GIT Sources" > ${rl}.txt
+ rm -f ${rl}.txt ${rl}.xml
+ # Now, track git source revision through hudson api: /job/${JOB_NAME}/${BUILD_NUMBER}/api/xml?xpath=//lastBuiltRevision
+ rl=${STAGINGDIR}/logs/GIT_REVISION
+ wget -O ${rl}.xml "http://hudson.qa.jboss.com/hudson/job/${JOB_NAME}/${BUILD_NUMBER}/api/xml..." --timeout=900 --wait=10 --random-wait --tries=30 --retry-connrefused --no-check-certificate --server-response
+ sed -e "s#<lastBuiltRevision><SHA1>\([a-f0-9]\+\)</SHA1><branch><SHA1>\([a-f0-9]\+\)</SHA1><name>\([^<>]\+\)</name></branch></lastBuiltRevision>#\3\@\1#g" ${rl}.xml | sed -e "s#<[^<>]\+>##g" > ${rl}.txt
else
echo "UNKNOWN" > ${rl}.txt
fi
14 years, 10 months
- 1
- 0
JBoss Tools SVN: r32028 - trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-10 17:48:07 -0400 (Fri, 10 Jun 2011)
New Revision: 32028
Modified:
trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/SeamComponentsFileLoader.java
Log:
JBIDE-9099
https://issues.jboss.org/browse/JBIDE-9099
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/SeamComponentsFileLoader.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/SeamComponentsFileLoader.java 2011-06-10 21:47:32 UTC (rev 32027)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/SeamComponentsFileLoader.java 2011-06-10 21:48:07 UTC (rev 32028)
@@ -40,13 +40,13 @@
return super.loadNamespace(element, object);
}
- public String serializeObject(XModelObject object) {
+ public Element createRootElement(XModelObject object) {
String rootName = getRootName(object);
Element element = createRootElement(rootName, null, null);
SeamNamespaces.getInstance(object.getModel().getMetaData(), getVersionSuffix(object)).validateNamespaces(object, element);
NamespaceMapping namespaceMapping = NamespaceMapping.load(object);
util.setNamespaceMapping(namespaceMapping);
- return serializeToElement(element, object);
+ return element;
}
private String getVersionSuffix(XModelObject o) {
14 years, 10 months
- 1
- 0
JBoss Tools SVN: r32027 - trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-10 17:47:32 -0400 (Fri, 10 Jun 2011)
New Revision: 32027
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/CDIBeansFileLoader.java
Log:
JBIDE-9099
https://issues.jboss.org/browse/JBIDE-9099
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/CDIBeansFileLoader.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/CDIBeansFileLoader.java 2011-06-10 21:46:33 UTC (rev 32026)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/CDIBeansFileLoader.java 2011-06-10 21:47:32 UTC (rev 32027)
@@ -40,15 +40,15 @@
return super.loadNamespace(element, object);
}
- public String serializeObject(XModelObject object) {
+ public Element createRootElement(XModelObject object) {
String rootName = getRootName(object);
Element element = createRootElement(rootName, null, null);
CDINamespaces.getInstance(object.getModel().getMetaData(), getVersionSuffix(object)).validateNamespaces(object, element);
NamespaceMapping namespaceMapping = NamespaceMapping.load(object);
util.setNamespaceMapping(namespaceMapping);
- return serializeToElement(element, object);
+ return element;
}
-
+
private String getVersionSuffix(XModelObject o) {
// String entity = o.getModelEntity().getName();
return ""; //$NON-NLS-1$
14 years, 10 months
- 1
- 0
JBoss Tools SVN: r32026 - in trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model: util and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-10 17:46:33 -0400 (Fri, 10 Jun 2011)
New Revision: 32026
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/SimpleWebFileLoader.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/PositionSearcher.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XModelObjectLoaderUtil.java
Log:
JBIDE-9099
https://issues.jboss.org/browse/JBIDE-9099
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/SimpleWebFileLoader.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/SimpleWebFileLoader.java 2011-06-10 21:44:03 UTC (rev 32025)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/SimpleWebFileLoader.java 2011-06-10 21:46:33 UTC (rev 32026)
@@ -168,11 +168,15 @@
}
public String serializeObject(XModelObject object) {
+ Element element = createRootElement(object);
+ return serializeToElement(element, object);
+ }
+
+ public Element createRootElement(XModelObject object) {
String systemId = object.getAttributeValue("systemId"); //$NON-NLS-1$
String publicId = object.getAttributeValue("publicId"); //$NON-NLS-1$
String rootName = getRootName(object);
- Element element = createRootElement(rootName, publicId, systemId);
- return serializeToElement(element, object);
+ return createRootElement(rootName, publicId, systemId);
}
protected String getRootName(XModelObject object) {
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/PositionSearcher.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/PositionSearcher.java 2011-06-10 21:44:03 UTC (rev 32025)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/PositionSearcher.java 2011-06-10 21:46:33 UTC (rev 32026)
@@ -14,6 +14,8 @@
import org.jboss.tools.common.meta.XAttribute;
import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.loaders.XObjectLoader;
+import org.jboss.tools.common.model.loaders.impl.SimpleWebFileLoader;
/**
* Searches for position of start tag corresponding to model object.
@@ -36,6 +38,7 @@
int startPosition;
int endPosition;
boolean selectAttributeName = false;
+ XModelObjectLoaderUtil util;
public PositionSearcher() {}
@@ -47,6 +50,19 @@
this.text = text;
this.object = object;
this.attribute = attribute;
+
+ XModelObject f = object;
+ while(f != null && f.getFileType() != XModelObject.FILE) f = f.getParent();
+ if(f != null) {
+ XObjectLoader loader = XModelObjectLoaderUtil.getObjectLoader(f);
+ if(loader instanceof SimpleWebFileLoader) {
+ //TODO have more common case, this does not include WebProcessLoader
+ SimpleWebFileLoader fileLoader = (SimpleWebFileLoader)loader;
+ fileLoader.createRootElement(f); // initializes namespaces if available.
+ util = fileLoader.getUtil();
+ }
+ }
+
}
public void execute() {
@@ -87,7 +103,7 @@
}
} else {
xml = xml.substring(0, xml.indexOf('.'));
- int e1 = text.indexOf("</" + object.getModelEntity().getXMLSubPath() + ">", startPosition); //$NON-NLS-1$ //$NON-NLS-2$
+ int e1 = text.indexOf("</" + getTagXMLName(object) + ">", startPosition); //$NON-NLS-1$ //$NON-NLS-2$
String s = e1 < 0 ? "" : text.substring(startPosition, e1); //$NON-NLS-1$
if(xml.length() == 0) {
int i1 = s.indexOf(">"); //$NON-NLS-1$
@@ -108,6 +124,20 @@
}
}
+ private String getTagXMLName(XModelObject object) {
+ String TAG_ATTR = "tag";//$NON-NLS-1$
+ String result = null;
+ if(object.getModelEntity().getAttribute(TAG_ATTR) != null) {
+ result = object.getAttributeValue(TAG_ATTR);
+ } else {
+ result = object.getModelEntity().getXMLSubPath();
+ if(result != null && util != null) {
+ result = util.applyNamespaceToTag(result);
+ }
+ }
+ return result;
+ }
+
private int findAttrPosition(String s, String name) {
int i = s.indexOf(name);
if(i < 0) {
@@ -149,7 +179,7 @@
void findTagEnd() {
if(startPosition < 0) return;
if(attribute != null && attribute.length() > 0) return;
- String tagname = object.getModelEntity().getXMLSubPath();
+ String tagname = getTagXMLName(object);
if(tagname == null || tagname.length() == 0) return;
String start = "<" + tagname; //$NON-NLS-1$
if(text.indexOf(start, startPosition) != startPosition) return;
@@ -169,7 +199,7 @@
public void selectObject(XModelObject object) {
if(object == null) return;
- String xml = object.getModelEntity().getXMLSubPath();
+ String xml = getTagXMLName(object);
String token = "<" + xml; //$NON-NLS-1$
if(object.getFileType() == XModelObject.FILE) {
startPos = nextStartPos(token, startPos + 1);
@@ -187,7 +217,7 @@
// String entity = object.getModelEntity().getName();
XModelObject[] os = parent.getChildren();
for (int i = 0; i < os.length; i++) {
- String xml_i = os[i].getModelEntity().getXMLSubPath();
+ String xml_i = getTagXMLName(os[i]);
if(!xml.equals(xml_i)) continue;
boolean ok = false;
while(!ok) {
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XModelObjectLoaderUtil.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XModelObjectLoaderUtil.java 2011-06-10 21:44:03 UTC (rev 32025)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XModelObjectLoaderUtil.java 2011-06-10 21:46:33 UTC (rev 32026)
@@ -261,7 +261,7 @@
return xmlname;
}
- protected final String applyNamespaceToTag(String xmlname) {
+ public final String applyNamespaceToTag(String xmlname) {
if(namespaceMapping != null) {
xmlname = namespaceMapping.convertToActual(xmlname);
}
14 years, 10 months
- 1
- 0
JBoss Tools SVN: r32025 - in trunk/jsf/plugins/org.jboss.tools.jsf: src/org/jboss/tools/jsf/jsf2/model and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-10 17:44:03 -0400 (Fri, 10 Jun 2011)
New Revision: 32025
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf2-components.meta
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/model/FileCompositeComponentLoader.java
Log:
JBIDE-9099
https://issues.jboss.org/browse/JBIDE-9099
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf2-components.meta
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf2-components.meta 2011-06-10 21:41:31 UTC (rev 32024)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf2-components.meta 2011-06-10 21:44:03 UTC (rev 32025)
@@ -1,409 +1,411 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE XModelEntityGroup PUBLIC "-//Red Hat, Inc.//DTD Meta 1.0//EN"
- "meta.dtd">
-<XModelEntityGroup>
- <VERSION DEPENDS="Model:1.0" MODULE="JSF" VERSION="1.0"/>
- <MAPPINGS>
- <MAPPING name="FileVersions">
- <PAIR name="JSF2Component2.0" value="FileJSF2Component"/>
- </MAPPING>
- <MAPPING name="Handlers"/>
- <MAPPING name="JSF2CompositeNamespaces">
- <PAIR name="composite" value="http://java.sun.com/jsf/composite"/>
- </MAPPING>
- <MAPPING name="Recognizers">
- <PAIR name="xhtml$4" value="org.jboss.tools.jsf.jsf2.model.FileCompositeComponentRecognizer"/>
- </MAPPING>
- </MAPPINGS>
- <ICONS>
- <GROUP name="action">
- <GROUP name="new">
- <GROUP name="jsf2"/>
- </GROUP>
- </GROUP>
- <GROUP name="main">
- <GROUP name="jsf2">
- <ICON name="attribute" path="images/jsf/attribute.gif"/>
- <ICON name="bean" path="images/struts/form_bean.gif"/>
- <ICON name="component" path="images/struts/plug_in.gif"/>
- <ICON name="components" path="images/struts/plug_in_folder.gif"/>
- <ICON name="file" path="images/file/html_file.gif"/>
- </GROUP>
- </GROUP>
- </ICONS>
- <GlobalActions kind="list"/>
- <XModelEntity
- AdoptManagerClass="org.jboss.tools.jst.web.model.handlers.JSPCompoundAdopt"
- ImplementationLoadingClass="org.jboss.tools.jsf.jsf2.model.FileCompositeComponentLoader"
- ImplementingClass="org.jboss.tools.common.model.filesystems.impl.SimpleFileImpl"
- ObjectEditorClass="org.jboss.tools.jst.jsp.jspeditor.HTMLTextEditor"
- XMLSUBPATH="html" name="FileJSF2Component">
- <XChildrenEntities>
- <XChildEntity maxCount="1" name="JSF2ComponentInterface" required="yes"/>
- <XChildEntity name="JSF2ComponentImplementation"/>
- <XChildEntity name="AnyElement"/>
- </XChildrenEntities>
- <XEntityRenderer>
- <ICONS>
- <ICON info="main.jsf2.file" type="main"/>
- </ICONS>
- </XEntityRenderer>
- <XModelAttributes>
- <XModelAttribute default="jsf2 component" loader="ElementType" name="element type">
- <Editor name="Uneditable"/>
- </XModelAttribute>
- <XModelAttribute PROPERTIES="category=general" name="name" xmlname="NAME"/>
- <XModelAttribute default="xhtml" name="extension" xmlname="EXTENSION">
- <Editor name="Uneditable"/>
- </XModelAttribute>
- <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
- <Editor name="Note"/>
- </XModelAttribute>
- <XModelAttribute loader="ElementType" name="_lateload" visibility="false">
- <Editor name="Uneditable"/>
- </XModelAttribute>
- <XModelAttribute default="no" name="isIncorrect" visibility="false">
- <Constraint loader="List">
- <value name="yes"/>
- <value name="no"/>
- </Constraint>
- <Editor name="Uneditable"/>
- </XModelAttribute>
- <XModelAttribute name="incorrectBody" visibility="false"/>
- <XModelAttribute PROPERTIES="save=always"
- default="http://www.w3.org/1999/xhtml" name="xmlns" xmlname="xmlns"/>
- <XModelAttribute name="xmlns:xsi" xmlname="xmlns:xsi"/>
- <XModelAttribute name="xsi:schemaLocation" xmlname="xsi:schemaLocation"/>
- <XModelAttribute
- default="composite composite http://java.sun.com/jsf/composite" name="namespaceMapping"/>
- <XModelAttribute name="encoding">
- <Constraint loader="ListString">
- <value name="ISO-8859-1"/>
- <value name="UTF-8"/>
- </Constraint>
- <Editor name="ListString"/>
- </XModelAttribute>
- <XModelAttribute default="-//W3C//DTD XHTML 1.0 Transitional//EN"
- name="publicId" visibility="false"/>
- <XModelAttribute
- default="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
- name="systemId" visibility="false"/>
- </XModelAttributes>
- <XActionItem kind="list">
- <XActionItem BaseActionName="Open" HandlerClassName="%Open%"
- ICON="action.empty" displayName="Open" kind="action" name="Open"/>
- <XActionItem displayName="Open With" group="1" kind="list" name="OpenWith">
- <XActionItem HIDE="always"
- HandlerClassName="org.jboss.tools.common.meta.action.impl.handlers.OpenWithExternalHandler"
- ICON="action.empty" PROPERTIES="extension=struts-config"
- displayName="Open with External Program" kind="action" name="OpenWithSelected"/>
- <XActionItem HIDE="always"
- HandlerClassName="org.jboss.tools.common.meta.action.impl.handlers.OpenWithChoiceHandler"
- ICON="action.empty" PROPERTIES="extension=struts-config"
- displayName="Choose Program..." kind="action" name="OpenWithChoice">
- <EntityData EntityName="OpenWithHelper">
- <AttributeData AttributeName="name"/>
- <AttributeData AttributeName="default"/>
- </EntityData>
- </XActionItem>
- </XActionItem>
- <XActionItem kind="list" name="EditActions">
- <XActionItem HIDE="always"
- HandlerClassName="org.jboss.tools.jsf.model.handlers.RenameFacesConfigHandler"
- ICON="action.empty" PROPERTIES="validator.edit=true"
- WizardClassName="%Default%" displayName="Rename..." kind="action" name="Rename">
- <EntityData EntityName="FacesConfig">
- <AttributeData AttributeName="name"/>
- </EntityData>
- </XActionItem>
- <XActionItem
- HandlerClassName="org.jboss.tools.common.model.filesystems.impl.handlers.RenameEclipseFileHandler"
- ICON="action.empty" displayName="Rename..." kind="action" name="RenameEclipse"/>
- </XActionItem>
- <XActionItem kind="list" name="SaveActions">
- <XActionItem HIDE="always" HandlerClassName="%SaveFile%"
- ICON="action.save" displayName="Save" kind="action" name="Save"/>
- </XActionItem>
- <XActionItem ICON="action.empty" displayName="New" group="1"
- kind="list" name="CreateActions">
- <XActionItem HandlerClassName="%Redirect%"
- ICON="action.new.struts.webapp.res_ref"
- PROPERTIES="validator.add=true;sourcepath=Interface;actionpath=CreateActions/AddAttribute"
- displayName="Attribute..." kind="action" name="AddAttribute"/>
- </XActionItem>
- <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
- <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
- ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
- <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
- ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
- <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%"
- ICON="action.paste" displayName="Paste" kind="action" name="Paste"/>
- </XActionItem>
- <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
- <XActionItem BaseActionName="Delete"
- HandlerClassName="org.jboss.tools.jsf.model.handlers.DeleteFacesConfigHandler"
- ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
- </XActionItem>
- <XActionItem ICON="action.empty" kind="list" name="Properties">
- <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
- displayName="Properties..." kind="action" name="Properties"/>
- </XActionItem>
- <XActionItem kind="list" name="DiscardActions">
- <XActionItem HIDE="always"
- HandlerClassName="org.jboss.tools.jsf.model.handlers.DiscardConfigHandler"
- ICON="action.delete"
- PROPERTIES="significanceMessageClass=org.jboss.tools.common.model.filesystems.impl.DiscardFileSignificanceMessage"
- displayName="Discard Changes" kind="action" name="Discard"/>
- </XActionItem>
- </XActionItem>
- <XDependencies/>
- </XModelEntity>
- <XModelEntity name="FileJSF2Component_EditorActionList">
- <XChildrenEntities/>
- <XEntityRenderer/>
- <XModelAttributes/>
- <XActionItem kind="list">
- <XActionItemReference entity="FileSeamComponents20"
- name="CreateActions" path="CreateActions"/>
- <XActionItemReference entity="FileSeamComponents20" name="Properties" path="Properties"/>
- <XActionItem kind="list" name="VerifyActions">
- <XActionItem kind="list" name="StaticActions"/>
- </XActionItem>
- </XActionItem>
- <XDependencies/>
- </XModelEntity>
- <XModelEntity ImplementingClass="%Custom%"
- XMLSUBPATH="composite:attribute" name="JSF2ComponentAttribute">
- <XChildrenEntities/>
- <XEntityRenderer>
- <ICONS>
- <ICON info="main.jsf2.attribute" type="main"/>
- </ICONS>
- </XEntityRenderer>
- <XModelAttributes>
- <XModelAttribute default="attribute" loader="ElementType" name="element type">
- <Editor name="Uneditable"/>
- </XModelAttribute>
- <XModelAttribute PROPERTIES="id=true;save=always;category=general"
- name="name" xmlname="name"/>
- <XModelAttribute PROPERTIES="category=general" name="displayName" xmlname="displayName"/>
- <XModelAttribute PROPERTIES="category=general"
- name="shortDescription" xmlname="shortDescription"/>
- <XModelAttribute PROPERTIES="category=general"
- name="method-signature" xmlname="method-signature"/>
- <XModelAttribute PROPERTIES="category=general" name="default" xmlname="default"/>
- <XModelAttribute PROPERTIES="category=general" default="false"
- name="required" xmlname="required">
- <Constraint loader="List">
- <value name="true"/>
- <value name="false"/>
- </Constraint>
- <Editor name="List"/>
- </XModelAttribute>
- <XModelAttribute PROPERTIES="category=general" name="applyTo" xmlname="applyTo"/>
- <XModelAttribute PROPERTIES="category=general" name="type" xmlname="type"/>
- <XModelAttribute PROPERTIES="category=general" default="false"
- name="preferred" xmlname="preferred">
- <Constraint loader="List">
- <value name="true"/>
- <value name="false"/>
- </Constraint>
- <Editor name="List"/>
- </XModelAttribute>
- <XModelAttribute PROPERTIES="category=general" default="false"
- name="expert" xmlname="expert">
- <Constraint loader="List">
- <value name="true"/>
- <value name="false"/>
- </Constraint>
- <Editor name="List"/>
- </XModelAttribute>
- <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
- <Editor name="Note"/>
- </XModelAttribute>
- </XModelAttributes>
- <XActionItem kind="list">
- <XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
- <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
- <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
- ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
- <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
- ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
- </XActionItem>
- <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
- <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
- ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
- </XActionItem>
- <XActionItem ICON="action.empty" kind="list" name="Properties">
- <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
- displayName="Properties..." kind="action" name="Properties"/>
- </XActionItem>
- <XActionItem displayName="move" kind="list" name="MoveActions">
- <XActionItem HIDE="always" HandlerClassName="%Move%"
- ICON="action.move" displayName="Move" kind="action" name="Move"/>
- </XActionItem>
- </XActionItem>
- <XDependencies/>
- </XModelEntity>
- <XModelEntity ImplementingClass="%Custom%"
- XMLSUBPATH="composite:implementation" name="JSF2ComponentImplementation">
- <XChildrenEntities>
- <XChildEntity name="AnyElement"/>
- </XChildrenEntities>
- <XEntityRenderer>
- <ICONS>
- <ICON info="main.jsf2.component" type="main"/>
- </ICONS>
- </XEntityRenderer>
- <XModelAttributes>
- <XModelAttribute default="implementation" loader="ElementType" name="element type">
- <Editor name="Uneditable"/>
- </XModelAttribute>
- <XModelAttribute PROPERTIES="id=true" default="Implementation" name="name"/>
- <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
- <Editor name="Note"/>
- </XModelAttribute>
- </XModelAttributes>
- <XActionItem kind="list">
- <XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
- <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
- <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
- ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
- <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
- ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
- </XActionItem>
- <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
- <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
- ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
- </XActionItem>
- <XActionItem ICON="action.empty" kind="list" name="Properties">
- <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
- displayName="Properties..." kind="action" name="Properties"/>
- </XActionItem>
- <XActionItem displayName="move" kind="list" name="MoveActions">
- <XActionItem HIDE="always" HandlerClassName="%Move%"
- ICON="action.move" displayName="Move" kind="action" name="Move"/>
- </XActionItem>
- </XActionItem>
- <XDependencies/>
- </XModelEntity>
- <XModelEntity ImplementingClass="%Custom%"
- PROPERTIES="children=%Ordered%"
- XMLSUBPATH="composite:interface" name="JSF2ComponentInterface">
- <XChildrenEntities>
- <XChildEntity name="JSF2ComponentAttribute"/>
- </XChildrenEntities>
- <XEntityRenderer>
- <ICONS>
- <ICON info="main.jsf2.component" type="main"/>
- </ICONS>
- </XEntityRenderer>
- <XModelAttributes>
- <XModelAttribute default="action" loader="ElementType" name="element type">
- <Editor name="Uneditable"/>
- </XModelAttribute>
- <XModelAttribute PROPERTIES="id=true" default="Interface" name="name"/>
- <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
- <Editor name="Note"/>
- </XModelAttribute>
- </XModelAttributes>
- <XActionItem kind="list">
- <XActionItem kind="list" name="CreateActions">
- <XActionItem HandlerClassName="%Create%"
- ICON="action.new.struts.webapp.res_ref"
- PROPERTIES="validator.add=true" WizardClassName="%Default%"
- displayName="Attribute..." kind="action" name="AddAttribute">
- <EntityData EntityName="JSF2ComponentAttribute">
- <AttributeData AttributeName="name"/>
- </EntityData>
- </XActionItem>
- </XActionItem>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
- <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
- <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
- ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
- <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
- ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
- </XActionItem>
- <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
- <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
- ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
- </XActionItem>
- <XActionItem ICON="action.empty" kind="list" name="Properties">
- <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
- displayName="Properties..." kind="action" name="Properties"/>
- </XActionItem>
- <XActionItem displayName="move" kind="list" name="MoveActions">
- <XActionItem HIDE="always" HandlerClassName="%Move%"
- ICON="action.move" displayName="Move" kind="action" name="Move"/>
- </XActionItem>
- </XActionItem>
- <XDependencies/>
- </XModelEntity>
- <XEntityExtension name="FileFolder">
- <XChildrenEntities>
- <XChildEntity name="FileJSF2Component"/>
- </XChildrenEntities>
- <XActionItem kind="list">
- <XActionItem ICON="action.empty" displayName="New" group="1"
- kind="list" name="CreateActions">
- <XActionItem ICON="action.newattribute" displayName="File" group="1"
- kind="list" name="CreateFiles">
- <XActionItem displayName="Web" kind="list" name="Web">
- <XActionItem HandlerClassName="%SpecialWizard%"
- ICON="action.new.seam.faces-config"
- PROPERTIES="entity=FileJSF2Component;extensions=.xml.;validator.addfile=true;support=org.jboss.tools.common.model.files.handlers.CreateFileSupport;extension=xhtml;entityVersion=JSF2Component"
- displayName="Composition Component..." kind="action" name="CreateFileJSF2Component">
- <EntityData EntityName="NewFileWizard">
- <AttributeData AttributeName="folder"/>
- <AttributeData AttributeName="separator" Mandatory="no"/>
- <AttributeData AttributeName="name"/>
- <AttributeData AttributeName="version"/>
- </EntityData>
- </XActionItem>
- </XActionItem>
- </XActionItem>
- </XActionItem>
- </XActionItem>
- </XEntityExtension>
- <XEntityExtension name="FileSystemFolder">
- <XChildrenEntities>
- <XChildEntity name="FileJSF2Component"/>
- </XChildrenEntities>
- <XActionItem kind="list">
- <XActionItem ICON="action.empty" displayName="New" group="1"
- kind="list" name="CreateActions">
- <XActionItem ICON="action.newattribute" displayName="File" group="1"
- kind="list" name="CreateFiles">
- <XActionItem displayName="Web" kind="list" name="Web">
- <XActionItem HandlerClassName="%SpecialWizard%"
- ICON="action.new.seam.faces-config"
- PROPERTIES="entity=FileJSF2Component;extensions=.xml.;validator.addfile=true;support=org.jboss.tools.common.model.files.handlers.CreateFileSupport;extension=xhtml;entityVersion=JSF2Component"
- displayName="Composition Component..." kind="action" name="CreateFileJSF2Component">
- <EntityData EntityName="NewFileWizard">
- <AttributeData AttributeName="folder"/>
- <AttributeData AttributeName="separator" Mandatory="no"/>
- <AttributeData AttributeName="name"/>
- <AttributeData AttributeName="version"/>
- </EntityData>
- </XActionItem>
- </XActionItem>
- </XActionItem>
- </XActionItem>
- </XActionItem>
- </XEntityExtension>
- <XEntityExtension name="FileSystemJar">
- <XChildrenEntities>
- <XChildEntity name="FileJSF2Component"/>
- </XChildrenEntities>
- <XActionItem kind="list"/>
- </XEntityExtension>
- <XEntityExtension name="JarFolder">
- <XChildrenEntities>
- <XChildEntity name="FileJSF2Component"/>
- </XChildrenEntities>
- <XActionItem kind="list"/>
- </XEntityExtension>
-</XModelEntityGroup>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE XModelEntityGroup PUBLIC "-//Red Hat, Inc.//DTD Meta 1.0//EN"
+ "meta.dtd">
+<XModelEntityGroup>
+ <VERSION DEPENDS="Model:1.0" MODULE="JSF" VERSION="1.0"/>
+ <MAPPINGS>
+ <MAPPING name="FileVersions">
+ <PAIR name="JSF2Component2.0" value="FileJSF2Component"/>
+ </MAPPING>
+ <MAPPING name="Handlers"/>
+ <MAPPING name="JSF2CompositeNamespaces">
+ <PAIR name="composite" value="http://java.sun.com/jsf/composite"/>
+ </MAPPING>
+ <MAPPING name="Recognizers">
+ <PAIR name="xhtml$4" value="org.jboss.tools.jsf.jsf2.model.FileCompositeComponentRecognizer"/>
+ </MAPPING>
+ </MAPPINGS>
+ <ICONS>
+ <GROUP name="action">
+ <GROUP name="new">
+ <GROUP name="jsf2"/>
+ </GROUP>
+ </GROUP>
+ <GROUP name="main">
+ <GROUP name="jsf2">
+ <ICON name="attribute" path="images/jsf/attribute.gif"/>
+ <ICON name="bean" path="images/struts/form_bean.gif"/>
+ <ICON name="component" path="images/struts/plug_in.gif"/>
+ <ICON name="components" path="images/struts/plug_in_folder.gif"/>
+ <ICON name="file" path="images/file/html_file.gif"/>
+ </GROUP>
+ </GROUP>
+ </ICONS>
+ <GlobalActions kind="list"/>
+ <XModelEntity
+ AdoptManagerClass="org.jboss.tools.jst.web.model.handlers.JSPCompoundAdopt"
+ ImplementationLoadingClass="org.jboss.tools.jsf.jsf2.model.FileCompositeComponentLoader"
+ ImplementingClass="org.jboss.tools.common.model.filesystems.impl.SimpleFileImpl"
+ ObjectEditorClass="org.jboss.tools.jst.jsp.jspeditor.HTMLTextEditor"
+ XMLSUBPATH="html" name="FileJSF2Component">
+ <XChildrenEntities>
+ <XChildEntity maxCount="1" name="JSF2ComponentInterface" required="yes"/>
+ <XChildEntity name="JSF2ComponentImplementation"/>
+ <XChildEntity name="AnyElement"/>
+ </XChildrenEntities>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.jsf2.file" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="jsf2 component" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general" name="name" xmlname="NAME"/>
+ <XModelAttribute default="xhtml" name="extension" xmlname="EXTENSION">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ <XModelAttribute loader="ElementType" name="_lateload" visibility="false">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute default="no" name="isIncorrect" visibility="false">
+ <Constraint loader="List">
+ <value name="yes"/>
+ <value name="no"/>
+ </Constraint>
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute name="incorrectBody" visibility="false"/>
+ <XModelAttribute PROPERTIES="save=always"
+ default="http://www.w3.org/1999/xhtml" name="xmlns" xmlname="xmlns"/>
+ <XModelAttribute name="xmlns:xsi" xmlname="xmlns:xsi"/>
+ <XModelAttribute name="xsi:schemaLocation" xmlname="xsi:schemaLocation"/>
+ <XModelAttribute
+ default="composite composite http://java.sun.com/jsf/composite" name="namespaceMapping"/>
+ <XModelAttribute name="encoding">
+ <Constraint loader="ListString">
+ <value name="ISO-8859-1"/>
+ <value name="UTF-8"/>
+ </Constraint>
+ <Editor name="ListString"/>
+ </XModelAttribute>
+ <XModelAttribute default="-//W3C//DTD XHTML 1.0 Transitional//EN"
+ name="publicId" visibility="false"/>
+ <XModelAttribute
+ default="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
+ name="systemId" visibility="false"/>
+ <XModelAttribute name="tag">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem BaseActionName="Open" HandlerClassName="%Open%"
+ ICON="action.empty" displayName="Open" kind="action" name="Open"/>
+ <XActionItem displayName="Open With" group="1" kind="list" name="OpenWith">
+ <XActionItem HIDE="always"
+ HandlerClassName="org.jboss.tools.common.meta.action.impl.handlers.OpenWithExternalHandler"
+ ICON="action.empty" PROPERTIES="extension=struts-config"
+ displayName="Open with External Program" kind="action" name="OpenWithSelected"/>
+ <XActionItem HIDE="always"
+ HandlerClassName="org.jboss.tools.common.meta.action.impl.handlers.OpenWithChoiceHandler"
+ ICON="action.empty" PROPERTIES="extension=struts-config"
+ displayName="Choose Program..." kind="action" name="OpenWithChoice">
+ <EntityData EntityName="OpenWithHelper">
+ <AttributeData AttributeName="name"/>
+ <AttributeData AttributeName="default"/>
+ </EntityData>
+ </XActionItem>
+ </XActionItem>
+ <XActionItem kind="list" name="EditActions">
+ <XActionItem HIDE="always"
+ HandlerClassName="org.jboss.tools.jsf.model.handlers.RenameFacesConfigHandler"
+ ICON="action.empty" PROPERTIES="validator.edit=true"
+ WizardClassName="%Default%" displayName="Rename..." kind="action" name="Rename">
+ <EntityData EntityName="FacesConfig">
+ <AttributeData AttributeName="name"/>
+ </EntityData>
+ </XActionItem>
+ <XActionItem
+ HandlerClassName="org.jboss.tools.common.model.filesystems.impl.handlers.RenameEclipseFileHandler"
+ ICON="action.empty" displayName="Rename..." kind="action" name="RenameEclipse"/>
+ </XActionItem>
+ <XActionItem kind="list" name="SaveActions">
+ <XActionItem HIDE="always" HandlerClassName="%SaveFile%"
+ ICON="action.save" displayName="Save" kind="action" name="Save"/>
+ </XActionItem>
+ <XActionItem ICON="action.empty" displayName="New" group="1"
+ kind="list" name="CreateActions">
+ <XActionItem HandlerClassName="%Redirect%"
+ ICON="action.new.struts.webapp.res_ref"
+ PROPERTIES="validator.add=true;sourcepath=Interface;actionpath=CreateActions/AddAttribute"
+ displayName="Attribute..." kind="action" name="AddAttribute"/>
+ </XActionItem>
+ <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
+ <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
+ ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
+ <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
+ ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
+ <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%"
+ ICON="action.paste" displayName="Paste" kind="action" name="Paste"/>
+ </XActionItem>
+ <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
+ <XActionItem BaseActionName="Delete"
+ HandlerClassName="org.jboss.tools.jsf.model.handlers.DeleteFacesConfigHandler"
+ ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
+ </XActionItem>
+ <XActionItem ICON="action.empty" kind="list" name="Properties">
+ <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
+ displayName="Properties..." kind="action" name="Properties"/>
+ </XActionItem>
+ <XActionItem kind="list" name="DiscardActions">
+ <XActionItem HIDE="always"
+ HandlerClassName="org.jboss.tools.jsf.model.handlers.DiscardConfigHandler"
+ ICON="action.delete"
+ PROPERTIES="significanceMessageClass=org.jboss.tools.common.model.filesystems.impl.DiscardFileSignificanceMessage"
+ displayName="Discard Changes" kind="action" name="Discard"/>
+ </XActionItem>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity name="FileJSF2Component_EditorActionList">
+ <XChildrenEntities/>
+ <XEntityRenderer/>
+ <XModelAttributes/>
+ <XActionItem kind="list">
+ <XActionItemReference entity="FileSeamComponents20"
+ name="CreateActions" path="CreateActions"/>
+ <XActionItemReference entity="FileSeamComponents20" name="Properties" path="Properties"/>
+ <XActionItem kind="list" name="VerifyActions">
+ <XActionItem kind="list" name="StaticActions"/>
+ </XActionItem>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%Custom%"
+ XMLSUBPATH="composite:attribute" name="JSF2ComponentAttribute">
+ <XChildrenEntities/>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.jsf2.attribute" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="attribute" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="id=true;save=always;category=general"
+ name="name" xmlname="name"/>
+ <XModelAttribute PROPERTIES="category=general" name="displayName" xmlname="displayName"/>
+ <XModelAttribute PROPERTIES="category=general"
+ name="shortDescription" xmlname="shortDescription"/>
+ <XModelAttribute PROPERTIES="category=general"
+ name="method-signature" xmlname="method-signature"/>
+ <XModelAttribute PROPERTIES="category=general" name="default" xmlname="default"/>
+ <XModelAttribute PROPERTIES="category=general" default="false"
+ name="required" xmlname="required">
+ <Constraint loader="List">
+ <value name="true"/>
+ <value name="false"/>
+ </Constraint>
+ <Editor name="List"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general" name="applyTo" xmlname="applyTo"/>
+ <XModelAttribute PROPERTIES="category=general" name="type" xmlname="type"/>
+ <XModelAttribute PROPERTIES="category=general" default="false"
+ name="preferred" xmlname="preferred">
+ <Constraint loader="List">
+ <value name="true"/>
+ <value name="false"/>
+ </Constraint>
+ <Editor name="List"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general" default="false"
+ name="expert" xmlname="expert">
+ <Constraint loader="List">
+ <value name="true"/>
+ <value name="false"/>
+ </Constraint>
+ <Editor name="List"/>
+ </XModelAttribute>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem kind="list" name="CreateActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
+ <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
+ ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
+ <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
+ ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
+ </XActionItem>
+ <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
+ <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
+ ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
+ </XActionItem>
+ <XActionItem ICON="action.empty" kind="list" name="Properties">
+ <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
+ displayName="Properties..." kind="action" name="Properties"/>
+ </XActionItem>
+ <XActionItem displayName="move" kind="list" name="MoveActions">
+ <XActionItem HIDE="always" HandlerClassName="%Move%"
+ ICON="action.move" displayName="Move" kind="action" name="Move"/>
+ </XActionItem>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%Custom%"
+ XMLSUBPATH="composite:implementation" name="JSF2ComponentImplementation">
+ <XChildrenEntities>
+ <XChildEntity name="AnyElement"/>
+ </XChildrenEntities>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.jsf2.component" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="implementation" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="id=true" default="Implementation" name="name"/>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem kind="list" name="CreateActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
+ <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
+ ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
+ <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
+ ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
+ </XActionItem>
+ <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
+ <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
+ ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
+ </XActionItem>
+ <XActionItem ICON="action.empty" kind="list" name="Properties">
+ <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
+ displayName="Properties..." kind="action" name="Properties"/>
+ </XActionItem>
+ <XActionItem displayName="move" kind="list" name="MoveActions">
+ <XActionItem HIDE="always" HandlerClassName="%Move%"
+ ICON="action.move" displayName="Move" kind="action" name="Move"/>
+ </XActionItem>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%Custom%"
+ PROPERTIES="children=%Ordered%" XMLSUBPATH="composite:interface" name="JSF2ComponentInterface">
+ <XChildrenEntities>
+ <XChildEntity name="JSF2ComponentAttribute"/>
+ </XChildrenEntities>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.jsf2.component" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="action" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="id=true" default="Interface" name="name"/>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem kind="list" name="CreateActions">
+ <XActionItem HandlerClassName="%Create%"
+ ICON="action.new.struts.webapp.res_ref"
+ PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="Attribute..." kind="action" name="AddAttribute">
+ <EntityData EntityName="JSF2ComponentAttribute">
+ <AttributeData AttributeName="name"/>
+ </EntityData>
+ </XActionItem>
+ </XActionItem>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
+ <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
+ ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
+ <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
+ ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
+ </XActionItem>
+ <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
+ <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
+ ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
+ </XActionItem>
+ <XActionItem ICON="action.empty" kind="list" name="Properties">
+ <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
+ displayName="Properties..." kind="action" name="Properties"/>
+ </XActionItem>
+ <XActionItem displayName="move" kind="list" name="MoveActions">
+ <XActionItem HIDE="always" HandlerClassName="%Move%"
+ ICON="action.move" displayName="Move" kind="action" name="Move"/>
+ </XActionItem>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XEntityExtension name="FileFolder">
+ <XChildrenEntities>
+ <XChildEntity name="FileJSF2Component"/>
+ </XChildrenEntities>
+ <XActionItem kind="list">
+ <XActionItem ICON="action.empty" displayName="New" group="1"
+ kind="list" name="CreateActions">
+ <XActionItem ICON="action.newattribute" displayName="File" group="1"
+ kind="list" name="CreateFiles">
+ <XActionItem displayName="Web" kind="list" name="Web">
+ <XActionItem HandlerClassName="%SpecialWizard%"
+ ICON="action.new.seam.faces-config"
+ PROPERTIES="entity=FileJSF2Component;extensions=.xml.;validator.addfile=true;support=org.jboss.tools.common.model.files.handlers.CreateFileSupport;extension=xhtml;entityVersion=JSF2Component"
+ displayName="Composition Component..." kind="action" name="CreateFileJSF2Component">
+ <EntityData EntityName="NewFileWizard">
+ <AttributeData AttributeName="folder"/>
+ <AttributeData AttributeName="separator" Mandatory="no"/>
+ <AttributeData AttributeName="name"/>
+ <AttributeData AttributeName="version"/>
+ </EntityData>
+ </XActionItem>
+ </XActionItem>
+ </XActionItem>
+ </XActionItem>
+ </XActionItem>
+ </XEntityExtension>
+ <XEntityExtension name="FileSystemFolder">
+ <XChildrenEntities>
+ <XChildEntity name="FileJSF2Component"/>
+ </XChildrenEntities>
+ <XActionItem kind="list">
+ <XActionItem ICON="action.empty" displayName="New" group="1"
+ kind="list" name="CreateActions">
+ <XActionItem ICON="action.newattribute" displayName="File" group="1"
+ kind="list" name="CreateFiles">
+ <XActionItem displayName="Web" kind="list" name="Web">
+ <XActionItem HandlerClassName="%SpecialWizard%"
+ ICON="action.new.seam.faces-config"
+ PROPERTIES="entity=FileJSF2Component;extensions=.xml.;validator.addfile=true;support=org.jboss.tools.common.model.files.handlers.CreateFileSupport;extension=xhtml;entityVersion=JSF2Component"
+ displayName="Composition Component..." kind="action" name="CreateFileJSF2Component">
+ <EntityData EntityName="NewFileWizard">
+ <AttributeData AttributeName="folder"/>
+ <AttributeData AttributeName="separator" Mandatory="no"/>
+ <AttributeData AttributeName="name"/>
+ <AttributeData AttributeName="version"/>
+ </EntityData>
+ </XActionItem>
+ </XActionItem>
+ </XActionItem>
+ </XActionItem>
+ </XActionItem>
+ </XEntityExtension>
+ <XEntityExtension name="FileSystemJar">
+ <XChildrenEntities>
+ <XChildEntity name="FileJSF2Component"/>
+ </XChildrenEntities>
+ <XActionItem kind="list"/>
+ </XEntityExtension>
+ <XEntityExtension name="JarFolder">
+ <XChildrenEntities>
+ <XChildEntity name="FileJSF2Component"/>
+ </XChildrenEntities>
+ <XActionItem kind="list"/>
+ </XEntityExtension>
+</XModelEntityGroup>
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/model/FileCompositeComponentLoader.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/model/FileCompositeComponentLoader.java 2011-06-10 21:41:31 UTC (rev 32024)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/model/FileCompositeComponentLoader.java 2011-06-10 21:44:03 UTC (rev 32025)
@@ -34,7 +34,7 @@
return super.loadNamespace(element, object);
}
- public String serializeObject(XModelObject object) {
+ public Element createRootElement(XModelObject object) {
String systemId = object.getAttributeValue("systemId"); //$NON-NLS-1$
String publicId = object.getAttributeValue("publicId"); //$NON-NLS-1$
String rootName = getRootName(object);
@@ -42,9 +42,9 @@
CompositeComponentNamespaces.getInstance(object.getModel().getMetaData(), "").validateNamespaces(object, element);
NamespaceMapping namespaceMapping = NamespaceMapping.load(object);
util.setNamespaceMapping(namespaceMapping);
- return serializeToElement(element, object);
+ return element;
}
-
+
}
class FileCompositeComponentUtil extends XModelObjectLoaderUtil {
@@ -61,6 +61,7 @@
public void load(Element element, XModelObject o) {
super.load(element, o);
if(o.getModelEntity().getName().startsWith("FileJSF2Component")) {
+ o.setAttributeValue("tag", element.getNodeName());
Element c = XMLUtilities.getUniqueChild(element, "composite:interface");
if(c == null) {
NodeList l = element.getElementsByTagName("composite:interface");
14 years, 10 months
- 1
- 0
JBoss Tools SVN: r32024 - in trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test: projects/JSF2CompositeOpenOn/WebContent/resources/demo and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-10 17:41:31 -0400 (Fri, 10 Jun 2011)
New Revision: 32024
Added:
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/WebContent/pages/inputname2.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/WebContent/resources/demo/input2.xhtml
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2CCAttrsOpenOnTest.java
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2CompositeLibOpenOnTest.java
Log:
JBIDE-9099
https://issues.jboss.org/browse/JBIDE-9099
Added: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/WebContent/pages/inputname2.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/WebContent/pages/inputname2.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/WebContent/pages/inputname2.xhtml 2011-06-10 21:41:31 UTC (rev 32024)
@@ -0,0 +1,36 @@
+<!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:c="http://java.sun.com/jstl/core"
+ xmlns:ez="http://java.sun.com/jsf/composite/demo">
+
+<f:loadBundle basename="resources" var="pageMsgs" />
+
+<ui:composition template="/templates/common.xhtml"
+ xmlns:jar="http://java.sun.com/jsf/composite/jarPage"
+ xmlns:jar1="http://java.sun.com/jsf/composite/jarPage1">
+
+ <h:outputStylesheet name="stylesheet/style.css" type="text/css"/>
+
+ <ui:define name="pageTitle">Input User Name</ui:define>
+
+ <ui:define name="pageHeader">Facelets Hello Application</ui:define>
+
+ <ui:define name="body">
+ <ez:input2 id="inputname" label="${registeredMsgs.prompt}" value="#{user.name}" action="#{user.sayHello}" submitlabel="Say Hello"/>
+ <h:outputText value="${registeredMsgs['demo.long.named.property']}" />
+ <h:outputText value="${pageMsgs.prompt}" />
+ <h:outputText value="${pageMsgs['demo.long.named.property']}" />
+ <div class="info">
+ <form>
+ <jar:echo1 echo="Hello" />
+ <jar:echo echo="Hello" />
+ <jar:echo anknownAttr="1" echo="Hello" />
+ <jar1:echo echo="Hello" />
+ </form>
+ </div>
+ </ui:define>
+</ui:composition>
+</html>
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/WebContent/pages/inputname2.xhtml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/WebContent/resources/demo/input2.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/WebContent/resources/demo/input2.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/WebContent/resources/demo/input2.xhtml 2011-06-10 21:41:31 UTC (rev 32024)
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<h:outputText xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:cc="http://java.sun.com/jsf/composite">
+
+ <cc:interface>
+ <cc:attribute name="label"/>
+ <cc:attribute name="value" required="true"/>
+ <cc:attribute name="action" required="true" method-signature="java.lang.String f()"/>
+ <cc:attribute name="submitlabel"/>
+ </cc:interface>
+
+ <cc:implementation>
+ <h:form>
+ <h:outputText value="#{cc.attrs.label}" />
+ <h:inputText value="#{cc.attrs.value}" />
+ <h:commandButton action="#{cc.attrs.action}" value="#{cc.attrs.submitlabel}" />
+ </h:form>
+ </cc:implementation>
+</h:outputText>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/WebContent/resources/demo/input2.xhtml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2CCAttrsOpenOnTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2CCAttrsOpenOnTest.java 2011-06-10 21:30:57 UTC (rev 32023)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2CCAttrsOpenOnTest.java 2011-06-10 21:41:31 UTC (rev 32024)
@@ -42,6 +42,7 @@
public class JSF2CCAttrsOpenOnTest extends TestCase {
private static final String PROJECT_NAME = "JSF2CompositeOpenOn";
private static final String PAGE_NAME = PROJECT_NAME+"/WebContent/resources/demo/input.xhtml";
+ private static final String PAGE2_NAME = PROJECT_NAME+"/WebContent/resources/demo/input2.xhtml";
public IProject project = null;
@@ -125,11 +126,24 @@
}
}
- public void testCCInterfaceAttrs() throws PartInitException, BadLocationException {
- final String editorName = "input.xhtml";
+ /**
+ * This test runs with default root element <html> and default namespace prefix 'composite'.
+ */
+ public void testCCInterfaceAttrs1() throws PartInitException, BadLocationException {
+ testCCInterfaceAttrs(PAGE_NAME, "input.xhtml");
+ }
+
+ /**
+ * In input2.xhtml root element is not html and namespace prefix is 'cc' instead of default 'composite'.
+ */
+ public void testCCInterfaceAttrs2() throws PartInitException, BadLocationException {
+ testCCInterfaceAttrs(PAGE2_NAME, "input2.xhtml");
+ }
+
+ void testCCInterfaceAttrs(String pageName, String editorName) throws PartInitException, BadLocationException {
final String elToTest = "cc.attrs.action";
final String atributeAction = "action";
- IEditorPart editor = WorkbenchUtils.openEditor(PAGE_NAME);
+ IEditorPart editor = WorkbenchUtils.openEditor(pageName);
assertTrue(editor instanceof JSPMultiPageEditor);
JobUtils.waitForIdle();
JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor;
Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2CompositeLibOpenOnTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2CompositeLibOpenOnTest.java 2011-06-10 21:30:57 UTC (rev 32023)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2CompositeLibOpenOnTest.java 2011-06-10 21:41:31 UTC (rev 32024)
@@ -39,6 +39,7 @@
public class JSF2CompositeLibOpenOnTest extends TestCase {
private static final String PROJECT_NAME = "JSF2CompositeOpenOn";
private static final String PAGE_NAME = PROJECT_NAME+"/WebContent/pages/inputname.xhtml";
+ private static final String PAGE2_NAME = PROJECT_NAME+"/WebContent/pages/inputname2.xhtml";
public IProject project = null;
protected void setUp() {
@@ -57,17 +58,28 @@
}
public void testAttribute() throws Exception {
- testOpenon("<ez:input", "label", "input.xhtml", "<composite:attribute name=\"label\"/>");
- testOpenon("<ez:input", "value", "input.xhtml", "<composite:attribute name=\"value\" required=\"true\"/>");
- testOpenon("<ez:input", "action", "input.xhtml", "<composite:attribute name=\"action\" required=\"true\" method-signature=\"java.lang.String f()\"/>");
+ testOpenon(PAGE_NAME, "<ez:input", "label", "input.xhtml", "<composite:attribute name=\"label\"/>");
+ testOpenon(PAGE_NAME, "<ez:input", "value", "input.xhtml", "<composite:attribute name=\"value\" required=\"true\"/>");
+ testOpenon(PAGE_NAME, "<ez:input", "action", "input.xhtml", "<composite:attribute name=\"action\" required=\"true\" method-signature=\"java.lang.String f()\"/>");
}
+ /**
+ * Root element is not html and namespace prefix is 'cc' instead of default 'composite.
+ *
+ * @throws Exception
+ */
+ public void testAttribute2() throws Exception {
+ testOpenon(PAGE2_NAME, "<ez:input2", "label", "input2.xhtml", "<cc:attribute name=\"label\"/>");
+ testOpenon(PAGE2_NAME, "<ez:input2", "value", "input2.xhtml", "<cc:attribute name=\"value\" required=\"true\"/>");
+ testOpenon(PAGE2_NAME, "<ez:input2", "action", "input2.xhtml", "<cc:attribute name=\"action\" required=\"true\" method-signature=\"java.lang.String f()\"/>");
+ }
+
public void testTag() throws Exception {
- testOpenon("<ez:input", "input", "input.xhtml", null);
+ testOpenon(PAGE_NAME, "<ez:input", "input", "input.xhtml", null);
}
- private void testOpenon(String text, String subtext, String editorName, String targetSelection) throws PartInitException, BadLocationException {
- IEditorPart editor = WorkbenchUtils.openEditor(PAGE_NAME);
+ private void testOpenon(String page, String text, String subtext, String editorName, String targetSelection) throws PartInitException, BadLocationException {
+ IEditorPart editor = WorkbenchUtils.openEditor(page);
assertTrue(editor instanceof JSPMultiPageEditor);
JobUtils.waitForIdle();
JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor;
14 years, 10 months
- 1
- 0
JBoss Tools SVN: r32023 - trunk/download.jboss.org/jbosstools/updates/indigo/RC2.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-06-10 17:30:57 -0400 (Fri, 10 Jun 2011)
New Revision: 32023
Modified:
trunk/download.jboss.org/jbosstools/updates/indigo/RC2/compositeArtifacts...
trunk/download.jboss.org/jbosstools/updates/indigo/RC2/compositeContent.xml
Log:
use newer Mylyn bits
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/RC2/compositeArtifacts...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/RC2/compositeArtifacts... 2011-06-10 21:29:39 UTC (rev 32022)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/RC2/compositeArtifacts... 2011-06-10 21:30:57 UTC (rev 32023)
@@ -12,7 +12,7 @@
endfun
nnoremap <Leader>ts :call ReplaceTimestamp()<CR>
-->
-<property name='p2.timestamp' value='1307490665000'/>
+<property name='p2.timestamp' value='1307490666000'/>
</properties>
<children size='18'>
<child location='../../requirements/indigo/201105270900-RC2/'/>
@@ -24,7 +24,7 @@
<child location='../../requirements/m2eclipse/20110607-1445/'/>
<!-- <child location='../../requirements/m2eclipse-wtp-e37/'/> -->
<!-- <child location='../../requirements/m2eclipse/0.13.0.201105260005/'/> -->
-<child location='../../requirements/mylyn/3.6-I20110526-2115/'/>
+<child location='../../requirements/mylyn/3.6-v20110608-1400/'/>
<child location='../../requirements/orbit/R20110523182458/'/>
<child location='../../requirements/ecf/3.5/'/>
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/RC2/compositeContent.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/RC2/compositeContent.xml 2011-06-10 21:29:39 UTC (rev 32022)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/RC2/compositeContent.xml 2011-06-10 21:30:57 UTC (rev 32023)
@@ -12,7 +12,7 @@
endfun
nnoremap <Leader>ts :call ReplaceTimestamp()<CR>
-->
-<property name='p2.timestamp' value='1307490665000'/>
+<property name='p2.timestamp' value='1307490666000'/>
</properties>
<children size='18'>
<child location='../../requirements/indigo/201105270900-RC2/'/>
@@ -24,7 +24,7 @@
<child location='../../requirements/m2eclipse/20110607-1445/'/>
<!-- <child location='../../requirements/m2eclipse-wtp-e37/'/> -->
<!-- <child location='../../requirements/m2eclipse/0.13.0.201105260005/'/> -->
-<child location='../../requirements/mylyn/3.6-I20110526-2115/'/>
+<child location='../../requirements/mylyn/3.6-v20110608-1400/'/>
<child location='../../requirements/orbit/R20110523182458/'/>
<child location='../../requirements/ecf/3.5/'/>
14 years, 10 months
- 1
- 0