JBoss Tools SVN: r31526 - trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-05-26 15:00:45 -0400 (Thu, 26 May 2011)
New Revision: 31526
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeployableMockDeploymentTester.java
Log:
[JBIDE-7936] creating a unique deploy- and tmpDeploy folder for each new server
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeployableMockDeploymentTester.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeployableMockDeploymentTester.java 2011-05-26 18:31:16 UTC (rev 31525)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeployableMockDeploymentTester.java 2011-05-26 19:00:45 UTC (rev 31526)
@@ -104,8 +104,7 @@
public void testSingleFolderCustomDeployFolderAbsolute() throws CoreException, IOException {
IPath serverDeployRoot = new Path(ServerRuntimeUtils.getDeployRoot(server));
final String folderName = "test";
- IPath state = ASTest.getDefault().getStateLocation();
- IPath moduleDeployRoot = state.append("testDeployments").append("absoluteFolder.place");
+ IPath moduleDeployRoot = ServerRuntimeUtils.getBaseDir().append("absoluteFolder.place");
moduleDeployRoot.toFile().mkdirs();
IModule[] mods = singleFolderCreateModules(folderName);
DeploymentPreferences prefs = DeploymentPreferenceLoader.loadPreferencesFromServer(server);
13 years, 5 months
JBoss Tools SVN: r31525 - trunk/documentation/guides/JBDS_Release_Notes/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-05-26 14:31:16 -0400 (Thu, 26 May 2011)
New Revision: 31525
Modified:
trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml
trunk/documentation/guides/JBDS_Release_Notes/en-US/Overview.xml
Log:
updated with new issues for JBDS 4.1 and JBT 3.2.1
Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml
===================================================================
--- trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 2011-05-26 18:23:16 UTC (rev 31524)
+++ trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 2011-05-26 18:31:16 UTC (rev 31525)
@@ -163,7 +163,7 @@
<itemizedlist>
<listitem>
<para>
- <ulink url="http://jira.jboss.com/jira/browse/JBIDE-0000">JBIDE-0000</ulink>:
+ <ulink url="http://jira.jboss.com/jira/browse/JBIDE-8617">JBIDE-8617</ulink>: A new RichFaces 4 palette is available to assist with RichFaces 4 components. This palette is hidden by default.
</para>
</listitem>
</itemizedlist>
@@ -235,7 +235,7 @@
<itemizedlist>
<listitem>
<para>
- <ulink url="http://jira.jboss.com/jira/browse/JBIDE-0000">JBIDE-0000</ulink>:
+ <ulink url="http://jira.jboss.com/jira/browse/JBDS-1602">JBDS-1602</ulink>: The Web Service Tester tool included as part of the Web Tools Platform contained an issue that would generate incorrect SOAP code, causing marshaling issues expressed as a <exceptionname>NullPointerException</exceptionname>. Multiple namespaces can now be handled without error and correct SOAP code is generated, removing marshaling issues.
</para>
</listitem>
</itemizedlist>
@@ -271,7 +271,7 @@
<itemizedlist>
<listitem>
<para>
- <ulink url="http://jira.jboss.com/jira/browse/JBIDE-0000">JBIDE-0000</ulink>:
+ <ulink url="http://jira.jboss.com/jira/browse/JBDS-1268">JBDS-1268</ulink>: The JBoss Developer Studio can now be installed by passing the installer a settings file named <filename>InstallConfigRecord.xml</filename>. To undertake this, setup an <filename>InstallConfigRecord.xml</filename> and run the following on a command line: <code>java -jar jbdevstudio-4.1.0.GA.jar InstallConfigRecord.xml</code>. This allows for an automated and reproducible installation. For further information consult the <emphasis>Getting Started Guide</emphasis>.
</para>
</listitem>
</itemizedlist>
Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Overview.xml
===================================================================
--- trunk/documentation/guides/JBDS_Release_Notes/en-US/Overview.xml 2011-05-26 18:23:16 UTC (rev 31524)
+++ trunk/documentation/guides/JBDS_Release_Notes/en-US/Overview.xml 2011-05-26 18:31:16 UTC (rev 31525)
@@ -9,7 +9,9 @@
</para>
<itemizedlist>
<listitem>
- Scriptble install of JBoss Developer Studio 4.1. When installing JBoss Developer Studio 4.1, you can now pass the installation a <filename>InstallConfigRecord.xml</filename> file to install with pre-defined settings, ensuring no user interaction is required. See the release note for JBDS-1268 in the new and fixed issues section of this document for further details.
+ <para>
+ Scriptble install of JBoss Developer Studio 4.1. When installing JBoss Developer Studio 4.1, you can now pass the installation a <filename>InstallConfigRecord.xml</filename> file to install with pre-defined settings, ensuring no user interaction is required. For further details see the release note for JBDS-1268 in the new and fixed issues section of this document, or the <emphasis>Getting Started Guide</emphasis> for this release.
+ </para>
</listitem>
<listitem>
<para>
13 years, 5 months
JBoss Tools SVN: r31524 - in trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test: util and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-05-26 14:23:16 -0400 (Thu, 26 May 2011)
New Revision: 31524
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeploymentTester.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ServerRuntimeUtils.java
Log:
[JBIDE-7936] creating a unique deploy- and tmpDeploy folder for each new server
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeploymentTester.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeploymentTester.java 2011-05-26 17:19:36 UTC (rev 31523)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeploymentTester.java 2011-05-26 18:23:16 UTC (rev 31524)
@@ -89,8 +89,7 @@
public void testSingleFolderCustomDeployFolderAbsolute() throws CoreException, IOException {
IPath serverDeployRoot = new Path(ServerRuntimeUtils.getDeployRoot(server));
final String folderName = "test";
- IPath state = ASTest.getDefault().getStateLocation();
- IPath moduleDeployRoot = state.append("testDeployments").append("absoluteFolder.place");
+ IPath moduleDeployRoot = ServerRuntimeUtils.getBaseDir().append("absoluteFolder.place");
moduleDeployRoot.toFile().mkdirs();
IModule[] mods = singleFolderCreateModules(folderName);
DeploymentPreferences prefs = DeploymentPreferenceLoader.loadPreferencesFromServer(server);
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ServerRuntimeUtils.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ServerRuntimeUtils.java 2011-05-26 17:19:36 UTC (rev 31523)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ServerRuntimeUtils.java 2011-05-26 18:23:16 UTC (rev 31524)
@@ -45,6 +45,7 @@
import org.osgi.framework.Bundle;
public class ServerRuntimeUtils extends TestCase {
+
public static final IVMInstall VM_INSTALL = JavaRuntime.getDefaultVMInstall();
public static final String DEFAULT_CONFIG = "default";
public static final String twiddle_suffix = ".mf.twiddle.jar";
@@ -84,19 +85,28 @@
serverRuntimeMap.put(IJBossToolingConstants.SERVER_EAP_50, IJBossToolingConstants.EAP_50);
}
public static IServer createMockDeployOnlyServer() throws CoreException {
- IPath state = ASTest.getDefault().getStateLocation();
- IPath deploy = state.append("testDeployments").append("deploy");
- IPath tmpDeploy = state.append("testDeployments").append("tmpDeploy");
- return ServerRuntimeUtils.createMockDeployOnlyServer(deploy.toOSString(),
- tmpDeploy.toOSString());
+ return ServerRuntimeUtils.createMockDeployOnlyServer(getDeployFolder(), getTmpDeployFolder());
}
public static IServer createMockJBoss7Server() throws CoreException {
- IPath state = ASTest.getDefault().getStateLocation();
- IPath deploy = state.append("testDeployments").append("deploy");
- IPath tmpDeploy = state.append("testDeployments").append("tmpDeploy");
- return createMockJBoss7Server(deploy.toOSString(), tmpDeploy.toOSString());
+ return createMockJBoss7Server(getDeployFolder(), getTmpDeployFolder());
}
+ private static String getDeployFolder() {
+ return getBaseDir().append(getRandomString()).append("deploy").toOSString();
+ }
+
+ private static String getTmpDeployFolder() {
+ return getBaseDir().append(getRandomString()).append("tmpDeploy").toOSString();
+ }
+
+ public static IPath getBaseDir() {
+ return ASTest.getDefault().getStateLocation().append("testDeployments");
+ }
+
+ private static String getRandomString() {
+ return String.valueOf(System.currentTimeMillis());
+ }
+
public static IServer createMockJBoss7Server(String deployLocation, String tempDeployLocation) throws CoreException {
IServer s = ServerCreationUtils.createServer(IJBossToolingConstants.AS_70, IJBossToolingConstants.SERVER_AS_70,
"/", "default");
13 years, 5 months
JBoss Tools SVN: r31523 - in trunk/download.jboss.org/jbosstools/updates: requirements/mylyn and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-05-26 13:19:36 -0400 (Thu, 26 May 2011)
New Revision: 31523
Modified:
trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml
trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml
trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/index.html
Log:
fix links to Mylyn 3.6
Modified: trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml 2011-05-26 17:18:40 UTC (rev 31522)
+++ trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml 2011-05-26 17:19:36 UTC (rev 31523)
@@ -12,7 +12,7 @@
endfun
nnoremap <Leader>ts :call ReplaceTimestamp()<CR>
-->
-<property name='p2.timestamp' value='1303858049000'/>
+<property name='p2.timestamp' value='1306430101000'/>
</properties>
<children size='20'>
<child location='../requirements/helios/SR2/'/>
@@ -24,7 +24,7 @@
<child location='../requirements/emf/2.6/'/>
<child location='../requirements/findbugs/1.3.9/'/>
<child location='../requirements/gwt/201012211742/'/>
-<child location='../requirements/mylyn/3.6/'/>
+<child location='../requirements/mylyn/3.6-I20110415-0655/'/>
<child location='../requirements/m2eclipse/0.12/'/>
<child location='../requirements/orbit/S20110124210048/'/>
Modified: trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml 2011-05-26 17:18:40 UTC (rev 31522)
+++ trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml 2011-05-26 17:19:36 UTC (rev 31523)
@@ -12,7 +12,7 @@
endfun
nnoremap <Leader>ts :call ReplaceTimestamp()<CR>
-->
-<property name='p2.timestamp' value='1303858063000'/>
+<property name='p2.timestamp' value='1306430101000'/>
</properties>
<children size='20'>
<child location='../requirements/helios/SR2/'/>
@@ -24,7 +24,7 @@
<child location='../requirements/emf/2.6/'/>
<child location='../requirements/findbugs/1.3.9/'/>
<child location='../requirements/gwt/201012211742/'/>
-<child location='../requirements/mylyn/3.6/'/>
+<child location='../requirements/mylyn/3.6-I20110415-0655/'/>
<child location='../requirements/m2eclipse/0.12/'/>
<child location='../requirements/orbit/S20110124210048/'/>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/index.html
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/index.html 2011-05-26 17:18:40 UTC (rev 31522)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/index.html 2011-05-26 17:19:36 UTC (rev 31523)
@@ -46,7 +46,8 @@
-->
<br/>
<ul>
-<li><a class=link href=3.6>Mylyn 3.6 + Bugzilla & JIRA connectors</a> (for Subclipse Mylyn integration, see <a href=../subclipse/index.html/>Subclipse Updates</a>)</li>
+<li><a class=link href=3.6-I20110504-0744>Mylyn 3.6-I20110504-0744 + Bugzilla & JIRA connectors</a> (for Subclipse Mylyn integration, see <a href=../subclipse/>Subclipse Updates</a>)</li>
+<li><a class=link href=3.6-I20110415-0655>Mylyn 3.6-I20110415-0655 + Bugzilla & JIRA connectors</a> (for Subclipse Mylyn integration, see <a href=../subclipse/>Subclipse Updates</a>)</li>
</ul>
<br/>
</td>
13 years, 5 months
JBoss Tools SVN: r31522 - trunk/build/aggregate/site.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-05-26 13:18:40 -0400 (Thu, 26 May 2011)
New Revision: 31522
Modified:
trunk/build/aggregate/site/site.xml
Log:
reorder and clean up site.xml for consistency w/ soa-site and jbds site files
Modified: trunk/build/aggregate/site/site.xml
===================================================================
--- trunk/build/aggregate/site/site.xml 2011-05-26 17:13:07 UTC (rev 31521)
+++ trunk/build/aggregate/site/site.xml 2011-05-26 17:18:40 UTC (rev 31522)
@@ -78,9 +78,9 @@
<!-- DISABLED for now -->
<!--
- <feature url="features/org.jboss.tools.profiler.feature_0.0.0.jar" id="org.jboss.tools.profiler.feature" version="0.0.0">
- <category name="AllTools"/>
- </feature>
+ <feature url="features/org.jboss.tools.profiler.feature_0.0.0.jar" id="org.jboss.tools.profiler.feature" version="0.0.0">
+ <category name="AllTools"/>
+ </feature>
-->
<!-- only in JBT -->
@@ -114,20 +114,21 @@
<feature url="features/org.jboss.tools.maven.project.examples.feature_0.0.0.jar" id="org.jboss.tools.maven.project.examples.feature" version="0.0.0">
<category name="MavenTools" />
</feature>
- <!-- <feature url="features/org.jboss.tools.gwt.feature_0.0.0.jar" id="org.jboss.tools.gwt.feature" version="0.0.0">
- <category name="GeneralTools" />
- </feature> -->
-
<feature url="features/org.jboss.tools.deltacloud.feature_0.0.0.jar" id="org.jboss.tools.deltacloud.feature" version="0.0.0">
<category name="CloudTools" />
</feature>
-
+ -->
+ <!--
+ <feature url="features/org.jboss.tools.gwt.feature_0.0.0.jar" id="org.jboss.tools.gwt.feature" version="0.0.0">
+ <category name="GeneralTools" />
</feature>
- <feature url="features/org.jboss.tools.runtime.core.feature_0.0.0.jar" id="org.jboss.tools.runtime.core.feature" version="0.0.0">
+ -->
+
+ <feature url="features/org.jboss.tools.runtime.feature_0.0.0.jar" id="org.jboss.tools.runtime.feature" version="0.0.0">
<category name="AllTools" />
</feature>
- <feature url="features/org.jboss.tools.runtime.feature_0.0.0.jar" id="org.jboss.tools.runtime.feature" version="0.0.0">
+ <feature url="features/org.jboss.tools.runtime.core.feature_0.0.0.jar" id="org.jboss.tools.runtime.core.feature" version="0.0.0">
<category name="AllTools" />
</feature>
@@ -135,11 +136,9 @@
<category name="AllTools" />
</feature>
- <!-- include but leave uncategorized -->
- <feature url="features/org.mozilla.xulrunner.feature_0.0.0.jar" id="org.mozilla.xulrunner.feature" version="0.0.0">
- </feature>
- <feature url="features/org.jboss.tools.xulrunner.feature_0.0.0.jar" id="org.jboss.tools.xulrunner.feature" version="0.0.0">
- </feature>
+ <!-- include but do not categorize -->
+ <feature url="features/org.jboss.tools.xulrunner.feature_0.0.0.jar" id="org.jboss.tools.xulrunner.feature" version="0.0.0"></feature>
+ <feature url="features/org.mozilla.xulrunner.feature_0.0.0.jar" id="org.mozilla.xulrunner.feature" version="0.0.0"></feature>
<!-- categories - see also ../../../common/aggregateRepos.*.properties -->
<category-def name="SDKTools" label="JBoss Tools SDK">
@@ -156,9 +155,8 @@
related to integration with 3rd party
plugins. Selecting this
category will give you all tools needed for
- both Web, Seam and SOA
- Development.
- </description>
+ both Web and Seam Development.
+ </description>
</category-def>
<category-def name="WebTools" label="Web and Java EE Development">
@@ -178,11 +176,6 @@
transformation.</description>
</category-def>
- <category-def name="TestPerfTools" label="Test and Performance">
- <description>Tools used to improve testing and performance.
- </description>
- </category-def>
-
<!-- Only in JBT -->
<category-def name="MavenTools" label="Maven Support">
<description>Plugins related to Maven and m2eclipse support. Use these
13 years, 5 months
JBoss Tools SVN: r31521 - trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-05-26 13:13:07 -0400 (Thu, 26 May 2011)
New Revision: 31521
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlinkDetector.java
Log:
https://issues.jboss.org/browse/JBIDE-9004
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlinkDetector.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlinkDetector.java 2011-05-26 16:52:23 UTC (rev 31520)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlinkDetector.java 2011-05-26 17:13:07 UTC (rev 31521)
@@ -177,32 +177,34 @@
private IRegion getRegion(Node n, int offset) {
if (n == null || !(n instanceof IDOMNode)) return null;
- int start = 0;
- int nameStart;
- int nameEnd;
+ int nameStart, nameEnd;
if(n instanceof IDOMAttr) {
IDOMAttr attr = (IDOMAttr)n;
String attrName = attr.getName();
- start = attr.getStartOffset();
+ int start = attr.getStartOffset();
nameStart = start;
nameEnd = nameStart + attrName.length();
- } else if(n instanceof IDOMElement) {
+ } else if(n instanceof IDOMElement) {
IDOMElement elem = (IDOMElement)n;
- String tagName = elem.getTagName();
- start = elem.getStartOffset();
- nameStart = start + "<".length(); //$NON-NLS-1$
- nameEnd = nameStart + tagName.length();
- if(offset > nameEnd) {
- start = elem.getEndStartOffset();
+ String tagName = elem.getTagName();
+ if(offset >= elem.getStartOffset() && offset <= elem.getStartEndOffset()){
+ int start = elem.getStartOffset();
+ nameStart = start + "<".length(); //$NON-NLS-1$
+ nameEnd = nameStart + tagName.length();
+ }else if(offset >= elem.getEndStartOffset() && offset <= (elem.getEndStartOffset() + elem.getLength())) {
+ int start = elem.getEndStartOffset();
nameStart = start + "</".length(); //$NON-NLS-1$
nameEnd = nameStart + tagName.length();
- }
- } else {
+ }else
+ return null;
+ } else
return null;
- }
-
- return new Region(nameStart,nameEnd - nameStart);
+
+ if(offset < nameEnd)
+ return new Region(nameStart, nameEnd - nameStart);
+ else
+ return null;
}
private String getURI(IRegion region, IDocument document) {
13 years, 5 months
JBoss Tools SVN: r31520 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/commands.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2011-05-26 12:52:23 -0400 (Thu, 26 May 2011)
New Revision: 31520
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/commands/CreateJSF2CompositeCommandHandler.java
Log:
https://issues.jboss.org/browse/JBIDE-9019 , '}' was added in the right position, error message was added.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/commands/CreateJSF2CompositeCommandHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/commands/CreateJSF2CompositeCommandHandler.java 2011-05-26 16:23:19 UTC (rev 31519)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/commands/CreateJSF2CompositeCommandHandler.java 2011-05-26 16:52:23 UTC (rev 31520)
@@ -144,145 +144,150 @@
length += n.getEndOffset() - n.getStartOffset();
}
}
+ }
+ /*
+ * Get composite's name and namespace from the popup dialog
+ */
+ InputDialog dlg = new InputDialog(Display.getCurrent().getActiveShell(),
+ "Creating composite component", //$NON-NLS-1$
+ "Enter component's namespace and name:", "namespace:name", //$NON-NLS-1$ //$NON-NLS-2$
+ new IInputValidator() {
+ public String isValid(String newText) {
+ String trim = newText.trim();
+ String result = null;
+ String[] split = trim.split(":", 2); //$NON-NLS-1$
+ Pattern p = Pattern.compile("([a-zA-Z]+\\d*)+"); //$NON-NLS-1$
+ /*
+ * Check the correct format.
+ * Matcher will accept only word characters with optional numbers.
+ */
+ if ((split.length != 2) || trim.startsWith(":") || trim.endsWith(":") //$NON-NLS-1$ //$NON-NLS-2$
+ || (split[0].length() == 0) || (split[1].length() == 0)) {
+ result = "Component's name should fit in the pattern \"namespace:name\""; //$NON-NLS-1$
+ } else if(!p.matcher(split[0]).matches()) {
+ result = "Namespace '"+split[0]+"' has wrong spelling, please correct"; //$NON-NLS-1$ //$NON-NLS-2$
+ } else if(!p.matcher(split[1]).matches()) {
+ result = "Name '"+split[1]+"' has wrong spelling, please correct"; //$NON-NLS-1$ //$NON-NLS-2$
+ } else {
+ String nameSpaceURI = JSF2ResourceUtil.JSF2_URI_PREFIX + "/" + split[0]; //$NON-NLS-1$
+ Object fld = JSF2ResourceUtil.findResourcesFolderContainerByNameSpace(project, nameSpaceURI);
+ if (fld instanceof IFolder) {
+ IResource res = ((IFolder) fld).findMember(split[1]+ ".xhtml"); //$NON-NLS-1$
+ if ((res instanceof IFile) && ((IFile)res).exists() ) {
+ result = "Component with the same name already exists"; //$NON-NLS-1$
+ }
+ }
+ }
+ return result;
+ }
+ });
+ if (dlg.open() == Window.OK) {
/*
- * Get composite's name and namespace from the popup dialog
+ * Create all required files
*/
- InputDialog dlg = new InputDialog(Display.getCurrent().getActiveShell(),
- "Creating composite component", //$NON-NLS-1$
- "Enter component's namespace and name:", "namespace:name", //$NON-NLS-1$ //$NON-NLS-2$
- new IInputValidator() {
- public String isValid(String newText) {
- String trim = newText.trim();
- String result = null;
- String[] split = trim.split(":", 2); //$NON-NLS-1$
- Pattern p = Pattern.compile("([a-zA-Z]+\\d*)+"); //$NON-NLS-1$
+ String componentName = dlg.getValue();
+ String[] split = componentName.split(":", 2); //$NON-NLS-1$
+ String path = ""; //$NON-NLS-1$
+ path = componentName.replaceAll(":", "/") + ".xhtml"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ if (project != null) {
+ IStructuredModel model = null;
+ try {
+ IFile createdFile = JSF2ResourceUtil
+ .createCompositeComponentFile(project, new Path(path));
/*
- * Check the correct format.
- * Matcher will accept only word characters with optional numbers.
+ * Add selected text to the template
*/
- if ((split.length != 2) || trim.startsWith(":") || trim.endsWith(":") //$NON-NLS-1$ //$NON-NLS-2$
- || (split[0].length() == 0) || (split[1].length() == 0)) {
- result = "Component's name should fit in the pattern \"namespace:name\""; //$NON-NLS-1$
- } else if(!p.matcher(split[0]).matches()) {
- result = "Namespace '"+split[0]+"' has wrong spelling, please correct"; //$NON-NLS-1$ //$NON-NLS-2$
- } else if(!p.matcher(split[1]).matches()) {
- result = "Name '"+split[1]+"' has wrong spelling, please correct"; //$NON-NLS-1$ //$NON-NLS-2$
- } else {
- String nameSpaceURI = JSF2ResourceUtil.JSF2_URI_PREFIX + "/" + split[0]; //$NON-NLS-1$
- Object fld = JSF2ResourceUtil.findResourcesFolderContainerByNameSpace(project, nameSpaceURI);
- if (fld instanceof IFolder) {
- IResource res = ((IFolder) fld).findMember(split[1]+ ".xhtml"); //$NON-NLS-1$
- if ((res instanceof IFile) && ((IFile)res).exists() ) {
- result = "Component with the same name already exists"; //$NON-NLS-1$
- }
- }
- }
- return result;
- }
- });
- if (dlg.open() == Window.OK) {
- /*
- * Create all required files
- */
- String componentName = dlg.getValue();
- String[] split = componentName.split(":", 2); //$NON-NLS-1$
- String path = ""; //$NON-NLS-1$
- path = componentName.replaceAll(":", "/") + ".xhtml"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- if (project != null) {
- IStructuredModel model = null;
- try {
- IFile createdFile = JSF2ResourceUtil
- .createCompositeComponentFile(project, new Path(path));
- /*
- * Add selected text to the template
- */
- IModelManager manager = StructuredModelManager.getModelManager();
- if (manager != null) {
- model = manager.getModelForEdit(createdFile);
- if (model instanceof IDOMModel) {
- IDOMModel domModel = (IDOMModel) model;
- IDOMDocument document = domModel.getDocument();
- NodeList list = document.getElementsByTagName(IMPLEMENTATION);
- if (list.getLength() == 1) {
- IDocument doc = editor.getDocumentProvider().getDocument(editor.getEditorInput());
- String replacedText = doc.get(offset, length);
- String content = document.getStructuredDocument().getText();
- int index = content.indexOf("<"+IMPLEMENTATION+">") + ("<"+IMPLEMENTATION+">").length(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- content = content.subSequence(0, index) + "\n" + replacedText + content.subSequence(index, content.length()); //$NON-NLS-1$
- domModel.reload(new ByteArrayInputStream(content.getBytes()));
- model.save();
+ IModelManager manager = StructuredModelManager.getModelManager();
+ if (manager != null) {
+ model = manager.getModelForEdit(createdFile);
+ if (model instanceof IDOMModel) {
+ IDOMModel domModel = (IDOMModel) model;
+ IDOMDocument document = domModel.getDocument();
+ NodeList list = document.getElementsByTagName(IMPLEMENTATION);
+ if (list.getLength() == 1) {
+ IDocument doc = editor.getDocumentProvider().getDocument(editor.getEditorInput());
+ String replacedText = doc.get(offset, length);
+ String content = document.getStructuredDocument().getText();
+ int index = content.indexOf("<"+IMPLEMENTATION+">") + ("<"+IMPLEMENTATION+">").length(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ content = content.subSequence(0, index) + "\n" + replacedText + content.subSequence(index, content.length()); //$NON-NLS-1$
+ domModel.reload(new ByteArrayInputStream(content.getBytes()));
+ model.save();
+ /*
+ * Register JSF 2 composite on the current page
+ */
+ String replacement = "<" + componentName + "> </" + componentName + ">"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ doc.replace(offset, length, replacement);
+ /*
+ * Register the required taglib
+ */
+ StructuredTextEditor ed = ((JSPMultiPageEditor) editor).getSourceEditor();
+ if (ed instanceof JSPTextEditor) {
+ String libraryUri = JSF2ResourceUtil.JSF2_URI_PREFIX + "/" + split[0]; //$NON-NLS-1$
+ PaletteTaglibInserter PaletteTaglibInserter = new PaletteTaglibInserter();
+ Properties p = new Properties();
+ p.put("selectionProvider", editor.getSelectionProvider()); //$NON-NLS-1$
+ p.setProperty(URIConstants.LIBRARY_URI, libraryUri);
+ p.setProperty(URIConstants.LIBRARY_VERSION, ""); //$NON-NLS-1$
+ p.setProperty(URIConstants.DEFAULT_PREFIX, split[0]);
+ p.setProperty(JSPPaletteInsertHelper.PROPOPERTY_ADD_TAGLIB, "true"); //$NON-NLS-1$
+ p.setProperty(XModelObjectConstants.REFORMAT, "yes"); //$NON-NLS-1$
+ p.setProperty(XModelObjectConstants.START_TEXT,
+ "<%@ taglib uri=\""+libraryUri+"\" prefix=\"" +split[0]+ "\" %>\\n"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ PaletteTaglibInserter.inserTaglib(ed.getTextViewer().getDocument(), p);
+ }
+ /*
+ * Add required taglibs to the composite file
+ */
+ IVisualContext context = editor.getJspEditor().getPageContext();
+ List<TaglibData> tl = null;
+ if (context instanceof SourceEditorPageContext) {
+ SourceEditorPageContext sourcePageContext = (SourceEditorPageContext) context;
/*
- * Register JSF 2 composite on the current page
+ * Get taglibs from the source file
*/
- String replacement = "<" + componentName + "> </" + componentName + ">"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- doc.replace(offset, length, replacement);
+ tl = sourcePageContext.getTagLibs();
+ Map<String, String> sourceTaglibs = new HashMap<String, String>();
+ Map<String, String> requiredTaglibs = new HashMap<String, String>();
+ Set<String> compositeTaglibs = new HashSet<String>();
+ for (TaglibData taglibData : tl) {
+ sourceTaglibs.put(taglibData.getPrefix(), taglibData.getUri());
+ }
/*
- * Register the required taglib
+ * Parse selected fragment to find used taglibs
*/
- StructuredTextEditor ed = ((JSPMultiPageEditor) editor).getSourceEditor();
- if (ed instanceof JSPTextEditor) {
- String libraryUri = JSF2ResourceUtil.JSF2_URI_PREFIX + "/" + split[0]; //$NON-NLS-1$
- PaletteTaglibInserter PaletteTaglibInserter = new PaletteTaglibInserter();
- Properties p = new Properties();
- p.put("selectionProvider", editor.getSelectionProvider()); //$NON-NLS-1$
- p.setProperty(URIConstants.LIBRARY_URI, libraryUri);
- p.setProperty(URIConstants.LIBRARY_VERSION, ""); //$NON-NLS-1$
- p.setProperty(URIConstants.DEFAULT_PREFIX, split[0]);
- p.setProperty(JSPPaletteInsertHelper.PROPOPERTY_ADD_TAGLIB, "true"); //$NON-NLS-1$
- p.setProperty(XModelObjectConstants.REFORMAT, "yes"); //$NON-NLS-1$
- p.setProperty(XModelObjectConstants.START_TEXT,
- "<%@ taglib uri=\""+libraryUri+"\" prefix=\"" +split[0]+ "\" %>\\n"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- PaletteTaglibInserter.inserTaglib(ed.getTextViewer().getDocument(), p);
+ Pattern p = Pattern.compile("<([a-zA-Z]+\\d*)+:"); //$NON-NLS-1$
+ Matcher m = p.matcher(replacedText);
+ while (m.find()) {
+ if (sourceTaglibs.keySet().contains(m.group(1))
+ && !requiredTaglibs.keySet().contains(m.group(1))) {
+ requiredTaglibs.put(m.group(1), sourceTaglibs.get(m.group(1)));
+ }
}
/*
- * Add required taglibs to the composite file
+ * Get the <html> tag of the created file
*/
- IVisualContext context = editor.getJspEditor().getPageContext();
- List<TaglibData> tl = null;
- if (context instanceof SourceEditorPageContext) {
- SourceEditorPageContext sourcePageContext = (SourceEditorPageContext) context;
- /*
- * Get taglibs from the source file
- */
- tl = sourcePageContext.getTagLibs();
- Map<String, String> sourceTaglibs = new HashMap<String, String>();
- Map<String, String> requiredTaglibs = new HashMap<String, String>();
- Set<String> compositeTaglibs = new HashSet<String>();
- for (TaglibData taglibData : tl) {
- sourceTaglibs.put(taglibData.getPrefix(), taglibData.getUri());
+ list = document.getElementsByTagName("html"); //$NON-NLS-1$
+ if (list.getLength() == 1) {
+ Element html = ((Element)list.item(0));
+ NamedNodeMap map = html.getAttributes();
+ for (int i = 0; i < map.getLength(); i++) {
+ compositeTaglibs.add(map.item(i).getNodeName());
}
- /*
- * Parse selected fragment to find used taglibs
- */
- Pattern p = Pattern.compile("<([a-zA-Z]+\\d*)+:"); //$NON-NLS-1$
- Matcher m = p.matcher(replacedText);
- while (m.find()) {
- if (sourceTaglibs.keySet().contains(m.group(1))
- && !requiredTaglibs.keySet().contains(m.group(1))) {
- requiredTaglibs.put(m.group(1), sourceTaglibs.get(m.group(1)));
+ for (String key : requiredTaglibs.keySet()) {
+ String xmlns = "xmlns:"+key; //$NON-NLS-1$
+ if (!compositeTaglibs.contains(xmlns)) {
+ html.setAttribute(xmlns, requiredTaglibs.get(key));
}
}
- /*
- * Get the <html> tag of the created file
- */
- list = document.getElementsByTagName("html"); //$NON-NLS-1$
- if (list.getLength() == 1) {
- Element html = ((Element)list.item(0));
- NamedNodeMap map = html.getAttributes();
- for (int i = 0; i < map.getLength(); i++) {
- compositeTaglibs.add(map.item(i).getNodeName());
- }
- for (String key : requiredTaglibs.keySet()) {
- String xmlns = "xmlns:"+key; //$NON-NLS-1$
- if (!compositeTaglibs.contains(xmlns)) {
- html.setAttribute(xmlns, requiredTaglibs.get(key));
- }
- }
- }
- }
- /*
- * Open created file
- */
+ }
+ }
+ /*
+ * Open created file
+ */
+ if (null == createdFile) {
+ JSFModelPlugin.getPluginLog().logError(
+ "Composite file:'"+path.toString()+"' cannot be created!"); //$NON-NLS-1$ //$NON-NLS-2$
+ } else {
FileEditorInput input = new FileEditorInput(createdFile);
JSPMultiPageEditor part = (JSPMultiPageEditor) PlatformUI
.getWorkbench().getActiveWorkbenchWindow().getActivePage()
@@ -290,17 +295,17 @@
}
}
}
- } catch (CoreException e) {
- JSFModelPlugin.getPluginLog().logError(e);
- } catch (IOException e) {
- JSFModelPlugin.getPluginLog().logError(e);
- } catch (BadLocationException e) {
- JSFModelPlugin.getPluginLog().logError(e);
- } finally {
- if (model != null) {
- model.releaseFromEdit();
- }
}
+ } catch (CoreException e) {
+ JSFModelPlugin.getPluginLog().logError(e);
+ } catch (IOException e) {
+ JSFModelPlugin.getPluginLog().logError(e);
+ } catch (BadLocationException e) {
+ JSFModelPlugin.getPluginLog().logError(e);
+ } finally {
+ if (model != null) {
+ model.releaseFromEdit();
+ }
}
}
}
13 years, 5 months
JBoss Tools SVN: r31519 - trunk/jsf/plugins/org.jboss.tools.jsf.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2011-05-26 12:23:19 -0400 (Thu, 26 May 2011)
New Revision: 31519
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml
Log:
https://issues.jboss.org/browse/JBIDE-8954 , categoryId was removed for the command
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 2011-05-26 16:10:44 UTC (rev 31518)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 2011-05-26 16:23:19 UTC (rev 31519)
@@ -875,7 +875,6 @@
<extension
point="org.eclipse.ui.commands">
<command
- categoryId="org.jboss.tools.jsf.commands.category"
id="org.jboss.tools.jsf.web.commands.CreateJSF2CompositeCommand"
description="%CreateJSF2Composite"
name="%CreateJSF2Composite"
13 years, 5 months
JBoss Tools SVN: r31518 - trunk/build/aggregate/site.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-05-26 12:10:44 -0400 (Thu, 26 May 2011)
New Revision: 31518
Modified:
trunk/build/aggregate/site/site.xml
Log:
https://issues.jboss.org/browse/JBIDE-8656 remove SOA features from JBT aggregate site
Modified: trunk/build/aggregate/site/site.xml
===================================================================
--- trunk/build/aggregate/site/site.xml 2011-05-26 16:10:32 UTC (rev 31517)
+++ trunk/build/aggregate/site/site.xml 2011-05-26 16:10:44 UTC (rev 31518)
@@ -63,10 +63,6 @@
<category name="AllTools" />
<category name="WebTools" />
</feature>
- <feature url="features/org.jboss.tools.esb.feature_0.0.0.jar" id="org.jboss.tools.esb.feature" version="0.0.0">
- <category name="AllTools" />
- <category name="SOATools" />
- </feature>
<feature url="features/org.jboss.tools.ws.feature_0.0.0.jar" id="org.jboss.tools.ws.feature" version="0.0.0">
<category name="AllTools" />
<category name="SOATools" />
@@ -75,12 +71,6 @@
<category name="AllTools" />
<category name="WebTools" />
</feature>
- <feature url="features/org.jboss.tools.smooks.feature_0.0.0.jar" id="org.jboss.tools.smooks.feature" version="0.0.0">
- <category name="AllTools" />
- <category name="SOATools" />
- <category name="DataTools" />
- <category name="GeneralTools" />
- </feature>
<feature url="features/org.jboss.tools.project.examples.feature_0.0.0.jar" id="org.jboss.tools.project.examples.feature" version="0.0.0">
<category name="AllTools" />
<category name="GeneralTools" />
@@ -124,13 +114,6 @@
<feature url="features/org.jboss.tools.maven.project.examples.feature_0.0.0.jar" id="org.jboss.tools.maven.project.examples.feature" version="0.0.0">
<category name="MavenTools" />
</feature>
- <feature url="features/org.jboss.tools.jbpm4.feature_0.0.0.jar" id="org.jboss.tools.jbpm4.feature" version="0.0.0">
- <category name="AllTools" />
- <category name="SOATools" />
- </feature>
- <feature url="features/org.jboss.tools.bpel.feature_0.0.0.jar" id="org.jboss.tools.bpel.feature" version="0.0.0">
- <category name="SOATools" />
- </feature>
<!-- <feature url="features/org.jboss.tools.gwt.feature_0.0.0.jar" id="org.jboss.tools.gwt.feature" version="0.0.0">
<category name="GeneralTools" />
</feature> -->
@@ -139,25 +122,7 @@
<category name="CloudTools" />
</feature>
- <!-- jBPM Tools & Flow features -->
- <feature url="features/org.jboss.tools.jbpm.convert.feature_0.0.0.jar" id="org.jboss.tools.jbpm.convert.feature" version="0.0.0">
- <category name="AllTools" />
- <category name="SOATools" />
</feature>
- <feature url="features/org.jboss.tools.jbpm.common.feature_0.0.0.jar" id="org.jboss.tools.jbpm.common.feature" version="0.0.0">
- <category name="AllTools" />
- <category name="SOATools" />
- </feature>
- <feature url="features/org.jboss.tools.jbpm3.feature_0.0.0.jar" id="org.jboss.tools.jbpm3.feature" version="0.0.0">
- <category name="AllTools" />
- <category name="SOATools" />
- </feature>
-
- <feature url="features/org.jboss.tools.modeshape.rest.feature_0.0.0.jar" id="org.jboss.tools.modeshape.rest.feature" version="0.0.0">
- <category name="AllTools" />
- <category name="GeneralTools" />
- </feature>
-
<feature url="features/org.jboss.tools.runtime.core.feature_0.0.0.jar" id="org.jboss.tools.runtime.core.feature" version="0.0.0">
<category name="AllTools" />
</feature>
@@ -196,14 +161,6 @@
</description>
</category-def>
- <category-def name="SOATools" label="SOA Development">
- <description>
- Tools to help create SOA applications. Use these if you
- work with jBPM,
- Drools, JBoss ESB, JBoss WebServices or Smooks.
- </description>
- </category-def>
-
<category-def name="WebTools" label="Web and Java EE Development">
<description>
Tools to help create web and enterprise applications,
@@ -241,42 +198,4 @@
</description>
</category-def>
- <!-- aggregated from other sources; only in JBT -->
- <feature url="features/org.pi4soa.core.feature_0.0.0.jar" id="org.pi4soa.core.feature" version="0.0.0">
- <category name="SOATools" />
- </feature>
- <feature url="features/org.savara.tools.feature_0.0.0.jar" id="org.savara.tools.feature" version="0.0.0">
- <category name="SOATools" />
- </feature>
- <feature url="features/org.jboss.savara.tools.feature_0.0.0.jar" id="org.jboss.savara.tools.feature" version="0.0.0">
- <category name="SOATools" />
- </feature>
- <!-- scribble.protocol.feature no longer exists in Savara/Scribble 2.0 -->
- <!-- <feature url="features/org.scribble.protocol.feature_0.0.0.jar" id="org.scribble.protocol.feature" version="0.0.0">
- </feature> -->
-
- <!-- aggregated from other sources -->
- <feature url="features/org.drools.eclipse.feature_0.0.0.jar" id="org.drools.eclipse.feature" version="0.0.0">
- <category name="AllTools" />
- <category name="SOATools" />
- <category name="GeneralTools" />
- </feature>
- <feature url="features/org.drools.eclipse.task.feature_0.0.0.jar" id="org.drools.eclipse.task.feature" version="0.0.0">
- <category name="AllTools" />
- <category name="SOATools" />
- </feature>
- <feature url="features/org.guvnor.tools.feature_0.0.0.jar" id="org.guvnor.tools.feature" version="0.0.0">
- <category name="AllTools" />
- <category name="SOATools" />
- </feature>
-
- <feature url="features/org.teiid.datatools.connectivity.feature_0.0.0.jar" id="org.teiid.datatools.connectivity.feature" version="0.0.0">
- <category name="DataTools" />
- </feature>
- <feature url="features/org.teiid.designer.feature_0.0.0.jar" id="org.teiid.designer.feature" version="0.0.0">
- <category name="DataTools" />
- </feature>
- <feature url="features/org.teiid.designer.runtime.feature_0.0.0.jar" id="org.teiid.designer.runtime.feature" version="0.0.0">
- <category name="DataTools" />
- </feature>
</site>
13 years, 5 months
JBoss Tools SVN: r31517 - trunk/build/aggregate/site.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-05-26 12:10:32 -0400 (Thu, 26 May 2011)
New Revision: 31517
Modified:
trunk/build/aggregate/site/aggregateSite.jbosstools.properties
Log:
should use M7, not M6
Modified: trunk/build/aggregate/site/aggregateSite.jbosstools.properties
===================================================================
--- trunk/build/aggregate/site/aggregateSite.jbosstools.properties 2011-05-26 16:10:20 UTC (rev 31516)
+++ trunk/build/aggregate/site/aggregateSite.jbosstools.properties 2011-05-26 16:10:32 UTC (rev 31517)
@@ -4,4 +4,4 @@
#update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21
# associate sites to add to the resulting repo
-associate.sites=http://download.jboss.org/jbosstools/updates/indigo/M6/
+associate.sites=http://download.jboss.org/jbosstools/updates/indigo/M7/
13 years, 5 months