JBoss Tools SVN: r29519 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-03-04 18:24:37 -0500 (Fri, 04 Mar 2011)
New Revision: 29519
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java
Log:
JBIDE-8275
https://issues.jboss.org/browse/JBIDE-8275
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java 2011-03-04 23:24:00 UTC (rev 29518)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java 2011-03-04 23:24:37 UTC (rev 29519)
@@ -215,6 +215,11 @@
IFile f = EclipseResourceUtil.getFile(jar);
if(f != null && f.exists()) {
root = jp.getPackageFragmentRoot(f);
+ } else {
+ f = EclipseResourceUtil.getFile(jar + "/META-INF/beans.xml");
+ if(f != null && f.exists()) {
+ root = jp.getPackageFragmentRoot(f.getParent().getParent());
+ }
}
}
if (root == null || !root.exists())
13 years, 10 months
JBoss Tools SVN: r29518 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/util.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-03-04 18:24:00 -0500 (Fri, 04 Mar 2011)
New Revision: 29518
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/util/JSF2ResourceUtil.java
Log:
JBIDE-8275
https://issues.jboss.org/browse/JBIDE-8275
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/util/JSF2ResourceUtil.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/util/JSF2ResourceUtil.java 2011-03-04 23:22:16 UTC (rev 29517)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/util/JSF2ResourceUtil.java 2011-03-04 23:24:00 UTC (rev 29518)
@@ -27,6 +27,7 @@
import org.eclipse.jdt.core.IPackageFragmentRoot;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.internal.core.ExternalPackageFragmentRoot;
import org.eclipse.jdt.internal.core.JarEntryDirectory;
import org.eclipse.jdt.internal.core.JarEntryFile;
import org.eclipse.jdt.internal.core.JarEntryResource;
@@ -83,8 +84,17 @@
return file;
}
}
- return searchInClassPath(project, "META-INF" + relativeLocation //$NON-NLS-1$
- + "/" + nodeName + ".xhtml", JAR_FILE_RESOURCE_TYPE); //$NON-NLS-1$ //$NON-NLS-2$
+ String classPathResource = "META-INF" + relativeLocation //$NON-NLS-1$
+ + "/" + nodeName + ".xhtml"; //$NON-NLS-1$ //$NON-NLS-2$
+ JarEntryResource jer = searchInClassPath(project, classPathResource, JAR_FILE_RESOURCE_TYPE);
+ if(jer != null) {
+ return jer;
+ }
+ IResource r = searchInClassPath2(project, classPathResource, JAR_FILE_RESOURCE_TYPE);
+ if(r != null) {
+ return r;
+ }
+ return null;
}
private static JarEntryResource searchInClassPath(IProject project,
@@ -121,6 +131,36 @@
return null;
}
+ private static IResource searchInClassPath2(IProject project,
+ String classPathResource, int jarResourceType) {
+ IJavaProject javaProject = JavaCore.create(project);
+ try {
+ for (IPackageFragmentRoot fragmentRoot : javaProject
+ .getAllPackageFragmentRoots()) {
+ IResource r = fragmentRoot.getResource();
+ if(fragmentRoot instanceof ExternalPackageFragmentRoot) {
+ r = ((ExternalPackageFragmentRoot) fragmentRoot).resource();
+ }
+ if(r instanceof IFolder && r.exists()) {
+ IFolder f = (IFolder)r;
+ IFile f1 = f.getFile(classPathResource);
+ if(f1.exists()) {
+ return f1;
+ }
+ IFolder f2 = f.getFolder(classPathResource);
+ if(f2.exists()) {
+ return f2;
+ }
+ }
+ }
+ } catch (JavaModelException e) {
+ JSFModelPlugin.getPluginLog().logError(e);
+ } catch (CoreException e) {
+ JSFModelPlugin.getPluginLog().logError(e);
+ }
+ return null;
+ }
+
public static Object findResourcesFolderContainerByNameSpace(
IProject project, String nameSpaceURI) {
if (nameSpaceURI == null || nameSpaceURI.indexOf(JSF2_URI_PREFIX) == -1) {
@@ -140,8 +180,16 @@
return resFolder;
}
}
- return searchInClassPath(project,
- "META-INF" + relativeLocation, JAR_DIRECTORY_RESOURCE_TYPE); //$NON-NLS-1$
+ String classPathResource = "META-INF" + relativeLocation; //$NON-NLS-1$
+ JarEntryResource jer = searchInClassPath(project, classPathResource, JAR_DIRECTORY_RESOURCE_TYPE);
+ if(jer != null) {
+ return jer;
+ }
+ IResource r = searchInClassPath2(project, classPathResource, JAR_DIRECTORY_RESOURCE_TYPE);
+ if(r != null) {
+ return r;
+ }
+ return null;
}
public static boolean isResourcesFolderExists(IProject project,
13 years, 10 months
JBoss Tools SVN: r29517 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-03-04 18:22:16 -0500 (Fri, 04 Mar 2011)
New Revision: 29517
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/Libs.java
Log:
JBIDE-8275
https://issues.jboss.org/browse/JBIDE-8275
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/Libs.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/Libs.java 2011-03-04 23:21:22 UTC (rev 29516)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/Libs.java 2011-03-04 23:22:16 UTC (rev 29517)
@@ -102,26 +102,33 @@
createMap();
return true;
}
+
+ static String LIB_PREFIX = "lib-"; //$NON-NLS-1$
void updateFileSystems(List<String> paths) {
if(fsVersion >= pathsVersion) {
return;
}
- XModelObject[] fs = object.getChildren("FileSystemJar"); //$NON-NLS-1$
+ XModelObject[] fs = object.getChildren();
Set<XModelObject> fss = new HashSet<XModelObject>();
- for (int i = 0; i < fs.length; i++) fss.add(fs[i]);
+ for (int i = 0; i < fs.length; i++) {
+ if(fs[i].getAttributeValue(XModelObjectConstants.ATTR_NAME).startsWith(LIB_PREFIX)) {
+ fss.add(fs[i]);
+ }
+ }
if(paths != null) for (int i = 0; i < paths.size(); i++) {
String path = paths.get(i);
- if(!EclipseResourceUtil.isJar(path)) continue;
+ boolean isJar = EclipseResourceUtil.isJar(path);
+ String libEntity = isJar ? "FileSystemJar" : "FileSystemFolder"; //$NON-NLS-1$ //$NON-NLS-2$
String fileName = new File(path).getName();
- if(EclipseResourceUtil.SYSTEM_JAR_SET.contains(fileName)) continue;
- String jsname = "lib-" + fileName; //$NON-NLS-1$
+ if(isJar && EclipseResourceUtil.SYSTEM_JAR_SET.contains(fileName)) continue;
+ String jsname = LIB_PREFIX + fileName;
XModelObject o = object.getChildByPath(jsname);
if(o != null) {
fss.remove(o);
} else {
- o = object.getModel().createModelObject("FileSystemJar", null); //$NON-NLS-1$
+ o = object.getModel().createModelObject(libEntity, null);
o.setAttributeValue(XModelObjectConstants.ATTR_NAME, jsname);
o.setAttributeValue(XModelObjectConstants.ATTR_NAME_LOCATION, path);
o.set(FileSystemsLoader.IS_ADDED_TO_CLASSPATH, XModelObjectConstants.TRUE);
13 years, 10 months
JBoss Tools SVN: r29516 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-03-04 18:21:22 -0500 (Fri, 04 Mar 2011)
New Revision: 29516
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java
Log:
JBIDE-8275
https://issues.jboss.org/browse/JBIDE-8275
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java 2011-03-04 22:29:02 UTC (rev 29515)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java 2011-03-04 23:21:22 UTC (rev 29516)
@@ -615,7 +615,7 @@
}
/**
- * Returns list of canonical paths to resources included in class path.
+ * Returns list of canonical paths to resources of libraries (jars and class folders) included in class path.
* @throws IOException
*/
public static List<String> getClassPath(IProject project) throws CoreException, IOException {
@@ -623,32 +623,35 @@
ArrayList<String> l = new ArrayList<String>();
IJavaProject javaProject = JavaCore.create(project);
- IPath p = javaProject.getOutputLocation();
- IResource r = p == null ? null : project.getWorkspace().getRoot().findMember(p);
- if(r != null && r.getLocation() != null && r.exists()) {
- String s = r.getLocation().toString();
- l.add(new java.io.File(s).getCanonicalPath());
- }
+// maybe we should restore outputs with special boolean parameter.
+// IPath p = javaProject.getOutputLocation();
+// IResource r = p == null ? null : project.getWorkspace().getRoot().findMember(p);
+// if(r != null && r.getLocation() != null && r.exists()) {
+// String s = r.getLocation().toString();
+// l.add(new java.io.File(s).getCanonicalPath());
+// }
IClasspathEntry[] es = javaProject.getResolvedClasspath(true);
+// maybe we should restore outputs with special boolean parameter.
+// for (int i = 0; i < es.length; i++) {
+// try {
+// if(es[i].getEntryKind() == IClasspathEntry.CPE_SOURCE && es[i].getOutputLocation() != null) {
+// IResource findMember = project.getWorkspace().getRoot().findMember(es[i].getOutputLocation());
+// if(findMember!=null) {
+// String s = findMember.getLocation().toString();
+// l.add(new java.io.File(s).getCanonicalPath());
+// }
+// }
+// } catch (IOException e) {
+// //ignore - we do not care about non-existent files here.
+// }
+// }
for (int i = 0; i < es.length; i++) {
+ if(es[i].getEntryKind() != IClasspathEntry.CPE_LIBRARY) continue;
+
+ String s = null;
+ String path = es[i].getPath().toString();
try {
- if(es[i].getEntryKind() == IClasspathEntry.CPE_SOURCE && es[i].getOutputLocation() != null) {
- IResource findMember = project.getWorkspace().getRoot().findMember(es[i].getOutputLocation());
- if(findMember!=null) {
- String s = findMember.getLocation().toString();
- l.add(new java.io.File(s).getCanonicalPath());
- }
- }
- } catch (IOException e) {
- //ignore - we do not care about non-existent files here.
- }
- }
- for (int i = 0; i < es.length; i++) {
- try {
- String s = null;
- String path = es[i].getPath().toString();
-
//First let's check if path is defined within Eclipse work space.
if(path.startsWith(XModelObjectConstants.SEPARATOR) && path.indexOf(XModelObjectConstants.SEPARATOR, 1) > 1) {
IResource findMember = ResourcesPlugin.getWorkspace().getRoot().findMember(es[i].getPath());
@@ -672,7 +675,7 @@
//If we failed to find resource in Eclipse work space,
//lets try the path as absolute on disk
- if(s == null && new java.io.File(path).isFile()) {
+ if(s == null && new java.io.File(path).exists()) {
s = path;
}
if(s != null) {
@@ -894,7 +897,16 @@
* @location Absolute path on disk
*/
public static IFile getFile(String location) {
- return ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(new Path(location).makeAbsolute());
+ IPath path = new Path(location).makeAbsolute();
+ IFile result = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(path);
+//TODO check if we need that addition
+// if(result == null || !result.exists()) {
+// IFile[] fs = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocation(path);
+// if(fs != null && fs.length > 0) {
+// result = fs[0];
+// }
+// }
+ return result;
}
public static IResource getFolder(String location) {
13 years, 10 months
JBoss Tools SVN: r29515 - in trunk/download.jboss.org/jbosstools/updates/requirements: birt and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-03-04 17:29:02 -0500 (Fri, 04 Mar 2011)
New Revision: 29515
Added:
trunk/download.jboss.org/jbosstools/updates/requirements/tptp/
trunk/download.jboss.org/jbosstools/updates/requirements/tptp/.gitignore
trunk/download.jboss.org/jbosstools/updates/requirements/tptp/build.xml
trunk/download.jboss.org/jbosstools/updates/requirements/tptp/index.html
Modified:
trunk/download.jboss.org/jbosstools/updates/requirements/birt/index.html
trunk/download.jboss.org/jbosstools/updates/requirements/gwt/index.html
trunk/download.jboss.org/jbosstools/updates/requirements/swtbot/build.xml
trunk/download.jboss.org/jbosstools/updates/requirements/swtbot/index.html
trunk/download.jboss.org/jbosstools/updates/requirements/webtools/index.html
Log:
fix HTML page titles for birt, gwt, swtbot, webtools; add tptp builder for 4.7
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/birt/index.html
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/birt/index.html 2011-03-04 22:01:40 UTC (rev 29514)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/birt/index.html 2011-03-04 22:29:02 UTC (rev 29515)
@@ -1,6 +1,6 @@
<html>
<head>
-<title>JBoss Tools Build Requirements - Orbit Update Sites</title>
+<title>JBoss Tools Build Requirements - BIRT Updates</title>
<style>
@import url("../../web/site.css");
</style>
@@ -18,7 +18,7 @@
<tr>
<td>  </td>
<td>
- <h2 class="title">JBoss Tools Build Requirements - Orbit Update Sites</h2>
+ <h2 class="title">JBoss Tools Build Requirements - BIRT Updates</h2>
<table width="100%">
<!-- <tr class="light-row" style="height: 30px">
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/gwt/index.html
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/gwt/index.html 2011-03-04 22:01:40 UTC (rev 29514)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/gwt/index.html 2011-03-04 22:29:02 UTC (rev 29515)
@@ -1,6 +1,6 @@
<html>
<head>
-<title>JBoss Tools Build Requirements - Orbit Update Sites</title>
+<title>JBoss Tools Build Requirements - GWT Updates</title>
<style>
@import url("../../web/site.css");
</style>
@@ -18,7 +18,7 @@
<tr>
<td>  </td>
<td>
- <h2 class="title">JBoss Tools Build Requirements - Orbit Update Sites</h2>
+ <h2 class="title">JBoss Tools Build Requirements - GWT Updates</h2>
<table width="100%">
<!-- <tr class="light-row" style="height: 30px">
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/swtbot/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/swtbot/build.xml 2011-03-04 22:01:40 UTC (rev 29514)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/swtbot/build.xml 2011-03-04 22:29:02 UTC (rev 29515)
@@ -17,11 +17,11 @@
-->
<target name="mirror">
<property name="URL" value="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site" />
- <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/swtbot-helios/" />
+ <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/swtbot/2.0.3/" />
<property name="compress" value="true" />
<p2.mirror>
- <repository location="file:${destination}/2.0.3" name="SWTBot plugins for Eclipse 3.6" />
+ <repository location="file:${destination}/2.0.3/" name="SWTBot plugins for Eclipse 3.6 - 3.7" />
<source>
<repository location="${URL}" />
</source>
@@ -29,6 +29,6 @@
<slicingOptions includeFeatures="true" followStrict="true" />
</p2.mirror>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/2.0.3" artifactRepository="file:${destination}/2.0.3" publishartifacts="true" source="${destination}/2.0.3" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/2.0.3/" artifactRepository="file:${destination}/2.0.3/" publishartifacts="true" source="${destination}/2.0.3/" compress="${compress}" />
</target>
</project>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/swtbot/index.html
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/swtbot/index.html 2011-03-04 22:01:40 UTC (rev 29514)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/swtbot/index.html 2011-03-04 22:29:02 UTC (rev 29515)
@@ -1,6 +1,6 @@
<html>
<head>
-<title>JBoss Tools Build Requirements - Orbit Update Sites</title>
+<title>JBoss Tools Build Requirements - SWTBot Updates</title>
<style>
@import url("../../web/site.css");
</style>
@@ -18,7 +18,7 @@
<tr>
<td>  </td>
<td>
- <h2 class="title">JBoss Tools Build Requirements - Orbit Update Sites</h2>
+ <h2 class="title">JBoss Tools Build Requirements - SWTBot Updates</h2>
<table width="100%">
<!-- <tr class="light-row" style="height: 30px">
Added: trunk/download.jboss.org/jbosstools/updates/requirements/tptp/.gitignore
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/tptp/.gitignore (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/tptp/.gitignore 2011-03-04 22:29:02 UTC (rev 29515)
@@ -0,0 +1 @@
+2.0.3
Copied: trunk/download.jboss.org/jbosstools/updates/requirements/tptp/build.xml (from rev 29514, trunk/download.jboss.org/jbosstools/updates/requirements/swtbot/build.xml)
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/tptp/build.xml (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/tptp/build.xml 2011-03-04 22:29:02 UTC (rev 29515)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project default="mirror">
+ <!-- run locally in Eclipse (to resolve p2 tasks) using these commandline options:
+
+ -os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}
+ -consoleLog -nosplash -data /tmp
+ -application org.eclipse.ant.core.antRunner
+ -f "/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/tptp/build.xml"
+
+ or, run headless on qa01 server, where Eclipse is installed into ~/eclipse:
+
+ export JAVA_HOME=/opt/jdk1.6.0; \
+ ${JAVA_HOME}/bin/java -cp ~/eclipse/plugins/org.eclipse.equinox.launcher_*.jar \
+ org.eclipse.equinox.launcher.Main -vm ${JAVA_HOME} -consoleLog -nosplash -data /tmp \
+ -application org.eclipse.ant.core.antRunner \
+ -f ~/RHDS/updates/requirements/tptp/build.xml -Ddestination=/tmp/tptp-repo
+ -->
+ <target name="mirror">
+ <property name="URL" value="http://download.eclipse.org/technology/tptp/helios/dev-build/update-site" />
+ <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/tptp/4.7/" />
+ <property name="compress" value="true" />
+
+ <p2.mirror>
+ <repository location="file:${destination}/4.7/" name="TPTP plugins for Eclipse 3.6 (EOL)" />
+ <source>
+ <repository location="${URL}" />
+ </source>
+
+ <slicingOptions includeFeatures="true" followStrict="true" />
+ </p2.mirror>
+
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/4.7/" artifactRepository="file:${destination}/4.7/" publishartifacts="true" source="${destination}/4.7/" compress="${compress}" />
+ </target>
+</project>
Copied: trunk/download.jboss.org/jbosstools/updates/requirements/tptp/index.html (from rev 29514, trunk/download.jboss.org/jbosstools/updates/requirements/swtbot/index.html)
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/tptp/index.html (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/tptp/index.html 2011-03-04 22:29:02 UTC (rev 29515)
@@ -0,0 +1,68 @@
+<html>
+<head>
+<title>JBoss Tools Build Requirements - TPTP Updates</title>
+<style>
+@import url("../../web/site.css");
+</style>
+</head>
+<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0">
+<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"
+ cellspacing="0" cellpadding="0">
+ <tr>
+ <td colspan="2"><img
+ src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td>
+ </tr>
+ <tr>
+ <td>  </td>
+ </tr>
+ <tr>
+ <td>  </td>
+ <td>
+ <h2 class="title">JBoss Tools Build Requirements - TPTP Updates</h2>
+ <table width="100%">
+
+ <!-- <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText"></p>
+ </td>
+ </tr> -->
+
+ <tr class="dark-row" style="height: 30px">
+ <td class="bodyText">
+ <!-- <p class="bodyText"></p> -->
+
+<!-- to convert raw fish listing to links do this in vi
+
+:%s#^sftp://tools@filemgmt.jboss.org/downloads_htdocs/tools/updates/requirements/\(.\+\)$#<li><a class=link href=\1>\1<\/a></li>#g
+
+Then sftp file into
+
+tools(a)filemgmt.jboss.org/downloads_htdocs/tools/updates/requirements/
+
+which becomes
+
+http://download.jboss.org/jbosstools/updates/requirements/
+
+-->
+ <br/>
+ <ul>
+<li><a class=link href=4.7>4.7</a> </li>
+ </ul>
+ <br/>
+ </td>
+ </tr>
+
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">Looking to download JBoss Tools? See <a class="link"
+ href="http://www.jboss.org/tools/download">JBoss Tools
+ Downloads</a>. See also <a
+ href="http://www.jboss.org/tools/download/installation">Installation
+ methods</a>.</p>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+</table>
+</html>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/webtools/index.html
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/webtools/index.html 2011-03-04 22:01:40 UTC (rev 29514)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/webtools/index.html 2011-03-04 22:29:02 UTC (rev 29515)
@@ -1,6 +1,6 @@
<html>
<head>
-<title>JBoss Tools Build Requirements - Orbit Update Sites</title>
+<title>JBoss Tools Build Requirements - Webtools Updates</title>
<style>
@import url("../../web/site.css");
</style>
@@ -18,7 +18,7 @@
<tr>
<td>  </td>
<td>
- <h2 class="title">JBoss Tools Build Requirements - Orbit Update Sites</h2>
+ <h2 class="title">JBoss Tools Build Requirements - Webtools Updates</h2>
<table width="100%">
<!-- <tr class="light-row" style="height: 30px">
13 years, 10 months
JBoss Tools SVN: r29514 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-03-04 17:01:40 -0500 (Fri, 04 Mar 2011)
New Revision: 29514
Modified:
trunk/build/target-platform/target2p2mirror.xml
Log:
bump from e361 to 362
Modified: trunk/build/target-platform/target2p2mirror.xml
===================================================================
--- trunk/build/target-platform/target2p2mirror.xml 2011-03-04 22:01:24 UTC (rev 29513)
+++ trunk/build/target-platform/target2p2mirror.xml 2011-03-04 22:01:40 UTC (rev 29514)
@@ -1,5 +1,5 @@
<project default="custom.build" name="jbosstools target platform p2.mirror generator">
- <property name="targetFile" value="e361-wtp322.target" />
+ <property name="targetFile" value="e362-wtp323.target" />
<!-- if useLatest = true, omit versions from p2.mirror script to fetch latest version available;
if useLatest = false, include versions and fetch specific versions requested. -->
13 years, 10 months
JBoss Tools SVN: r29513 - branches/jbosstools-3.2.x/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-03-04 17:01:24 -0500 (Fri, 04 Mar 2011)
New Revision: 29513
Modified:
branches/jbosstools-3.2.x/build/target-platform/target2p2mirror.xml
Log:
bump from e361 to 362
Modified: branches/jbosstools-3.2.x/build/target-platform/target2p2mirror.xml
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/target2p2mirror.xml 2011-03-04 17:21:53 UTC (rev 29512)
+++ branches/jbosstools-3.2.x/build/target-platform/target2p2mirror.xml 2011-03-04 22:01:24 UTC (rev 29513)
@@ -1,5 +1,5 @@
<project default="custom.build" name="jbosstools target platform p2.mirror generator">
- <property name="targetFile" value="e361-wtp322.target" />
+ <property name="targetFile" value="e362-wtp323.target" />
<!-- if useLatest = true, omit versions from p2.mirror script to fetch latest version available;
if useLatest = false, include versions and fetch specific versions requested. -->
13 years, 10 months
JBoss Tools SVN: r29512 - trunk/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-03-04 12:21:53 -0500 (Fri, 04 Mar 2011)
New Revision: 29512
Modified:
trunk/build/parent/pom.xml
Log:
bump e361-wtp322 to e362-wtp323
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2011-03-04 17:21:21 UTC (rev 29511)
+++ trunk/build/parent/pom.xml 2011-03-04 17:21:53 UTC (rev 29512)
@@ -33,7 +33,7 @@
<!-- Set this to a path on your own machine, or use remote URL like http://download.jboss.org/jbosstools/updates/target-platform/latest/
Can also generate a local.target file which will always point to your local
repo w/o having to edit here. See local.target profile below for more information. -->
- <target.platform.site>file://home/hudson/static_build_env/jbds/target-platform/e361-wtp322.target/
+ <target.platform.site>file://home/hudson/static_build_env/jbds/target-platform/e362-wtp323.target/
</target.platform.site>
<jbosstools.update.site>http://download.jboss.org/jbosstools/updates/nightly/trunk</jbosstools.update.site>
<jbosstools-target-platform-repo>http://download.jboss.org/jbosstools/updates/target-platform/latest/</jbosstools-target-platform-repo>
13 years, 10 months
JBoss Tools SVN: r29511 - branches/jbosstools-3.2.x/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-03-04 12:21:21 -0500 (Fri, 04 Mar 2011)
New Revision: 29511
Modified:
branches/jbosstools-3.2.x/build/parent/pom.xml
Log:
bump e361-wtp322 to e362-wtp323
Modified: branches/jbosstools-3.2.x/build/parent/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/build/parent/pom.xml 2011-03-04 14:37:05 UTC (rev 29510)
+++ branches/jbosstools-3.2.x/build/parent/pom.xml 2011-03-04 17:21:21 UTC (rev 29511)
@@ -33,7 +33,7 @@
<!-- Set this to a path on your own machine, or use remote URL like http://download.jboss.org/jbosstools/updates/target-platform/latest/
Can also generate a local.target file which will always point to your local
repo w/o having to edit here. See local.target profile below for more information. -->
- <target.platform.site>file://home/hudson/static_build_env/jbds/target-platform/e361-wtp322.target/
+ <target.platform.site>file://home/hudson/static_build_env/jbds/target-platform/e362-wtp323.target/
</target.platform.site>
<jbosstools.update.site>http://download.jboss.org/jbosstools/updates/nightly/3.2_stable_branch/</jbosstools.update.site>
<jbosstools-target-platform-repo>http://download.jboss.org/jbosstools/updates/target-platform/latest/</jbosstools-target-platform-repo>
13 years, 10 months
JBoss Tools SVN: r29510 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2011-03-04 09:37:05 -0500 (Fri, 04 Mar 2011)
New Revision: 29510
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaBasicMapping.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaBasicMappingImpl.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/TypeImpl.java
Log:
https://issues.jboss.org/browse/JBIDE-8512
Added Type completion proposals and TypeDefContainer support to BasicMapping
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaBasicMapping.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaBasicMapping.java 2011-03-04 09:54:54 UTC (rev 29509)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaBasicMapping.java 2011-03-04 14:37:05 UTC (rev 29510)
@@ -22,4 +22,6 @@
*/
public interface HibernateJavaBasicMapping extends JavaBasicMapping, Generated, IndexHolder, TypeHolder {
+ HibernateJavaTypeDefContainer getTypeDefContainer();
+
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaBasicMappingImpl.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaBasicMappingImpl.java 2011-03-04 09:54:54 UTC (rev 29509)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaBasicMappingImpl.java 2011-03-04 14:37:05 UTC (rev 29510)
@@ -11,12 +11,14 @@
package org.jboss.tools.hibernate.jpt.core.internal.context.java;
+import java.util.Iterator;
import java.util.List;
import java.util.Vector;
import org.eclipse.jdt.core.dom.CompilationUnit;
import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
import org.eclipse.jpt.core.internal.context.java.AbstractJavaBasicMapping;
+import org.eclipse.jpt.utility.Filter;
import org.eclipse.wst.validation.internal.provisional.core.IMessage;
import org.eclipse.wst.validation.internal.provisional.core.IReporter;
import org.jboss.tools.hibernate.jpt.core.internal.HibernateAbstractJpaFactory;
@@ -34,6 +36,8 @@
public class HibernateJavaBasicMappingImpl extends AbstractJavaBasicMapping
implements HibernateJavaBasicMapping {
+ protected final HibernateJavaTypeDefContainer typeDefContainer;
+
protected GenerationTime specifiedGenerationTime;
protected JavaIndex index;
@@ -42,6 +46,7 @@
public HibernateJavaBasicMappingImpl(JavaPersistentAttribute parent) {
super(parent);
+ this.typeDefContainer = getJpaFactory().buildJavaTypeDefContainer(parent);
}
@Override
@@ -59,6 +64,7 @@
@Override
protected void initialize() {
super.initialize();
+ this.typeDefContainer.initialize(this.getResourcePersistentAttribute());
this.specifiedGenerationTime = this.getResourceGenerationTime();
this.initializeIndex();
this.initializeType();
@@ -67,11 +73,16 @@
@Override
protected void update() {
super.update();
+ this.typeDefContainer.update(this.getResourcePersistentAttribute());
this.setGenerationTime_(this.getResourceGenerationTime());
this.updateIndex();
this.updateType();
}
+ public HibernateJavaTypeDefContainer getTypeDefContainer() {
+ return this.typeDefContainer;
+ }
+
public GeneratedAnnotation getResourceGenerated() {
return (GeneratedAnnotation) getResourcePersistentAttribute().getAnnotation(GeneratedAnnotation.ANNOTATION_NAME);
}
@@ -250,14 +261,51 @@
protected TypeAnnotation getTypeResource() {
return (TypeAnnotation) this.getResourcePersistentAttribute().getAnnotation(TypeAnnotation.ANNOTATION_NAME);
}
-
- /* (non-Javadoc)
- * @see org.eclipse.jpt.core.internal.context.java.AbstractJavaBasicMapping#validate(java.util.List, org.eclipse.wst.validation.internal.provisional.core.IReporter, org.eclipse.jdt.core.dom.CompilationUnit)
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.jpt.core.internal.context.java.AbstractJavaBasicMapping#
+ * javaCompletionProposals(int, org.eclipse.jpt.utility.Filter,
+ * org.eclipse.jdt.core.dom.CompilationUnit)
*/
@Override
+ public Iterator<String> javaCompletionProposals(int pos,
+ Filter<String> filter, CompilationUnit astRoot) {
+ Iterator<String> result = super.javaCompletionProposals(pos, filter,
+ astRoot);
+ if (result != null) {
+ return result;
+ }
+ result = this.getTypeDefContainer().javaCompletionProposals(pos,
+ filter, astRoot);
+ if (result != null) {
+ return result;
+ }
+ if (this.getType() != null) {
+ result = this.getType().javaCompletionProposals(pos, filter,
+ astRoot);
+ if (result != null) {
+ return result;
+ }
+ }
+ return null;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.eclipse.jpt.core.internal.context.java.AbstractJavaBasicMapping#validate
+ * (java.util.List,
+ * org.eclipse.wst.validation.internal.provisional.core.IReporter,
+ * org.eclipse.jdt.core.dom.CompilationUnit)
+ */
+ @Override
public void validate(List<IMessage> messages, IReporter reporter,
CompilationUnit astRoot) {
super.validate(messages, reporter, astRoot);
+ this.typeDefContainer.validate(messages, reporter, astRoot);
if (this.index != null){
this.index.validate(messages, reporter, astRoot);
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/TypeImpl.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/TypeImpl.java 2011-03-04 09:54:54 UTC (rev 29509)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/TypeImpl.java 2011-03-04 14:37:05 UTC (rev 29510)
@@ -10,6 +10,8 @@
******************************************************************************/
package org.jboss.tools.hibernate.jpt.core.internal.context.java;
+import java.util.Arrays;
+import java.util.Iterator;
import java.util.List;
import org.eclipse.jdt.core.IType;
@@ -18,6 +20,9 @@
import org.eclipse.jpt.core.context.java.JavaJpaContextNode;
import org.eclipse.jpt.core.internal.context.java.AbstractJavaJpaContextNode;
import org.eclipse.jpt.core.utility.TextRange;
+import org.eclipse.jpt.utility.Filter;
+import org.eclipse.jpt.utility.internal.StringTools;
+import org.eclipse.jpt.utility.internal.iterables.FilteringIterable;
import org.eclipse.wst.validation.internal.provisional.core.IMessage;
import org.eclipse.wst.validation.internal.provisional.core.IReporter;
import org.jboss.tools.hibernate.jpt.core.internal.context.HibernatePersistenceUnit;
@@ -83,6 +88,7 @@
validateType(messages, reporter, astRoot);
}
+ @Override
public HibernatePersistenceUnit getPersistenceUnit() {
return (HibernatePersistenceUnit) this.getParent().getPersistenceUnit();
}
@@ -91,6 +97,40 @@
return this.typeResource.getTypeTextRange(astRoot);
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.eclipse.jpt.core.internal.context.java.AbstractJavaJpaContextNode
+ * #javaCompletionProposals(int, org.eclipse.jpt.utility.Filter,
+ * org.eclipse.jdt.core.dom.CompilationUnit)
+ */
+ @Override
+ public Iterator<String> javaCompletionProposals(int pos,
+ Filter<String> filter, CompilationUnit astRoot) {
+ Iterator<String> result = super.javaCompletionProposals(pos, filter,
+ astRoot);
+ if (result != null) {
+ return result;
+ }
+ System.out.println(getPersistenceUnit().uniqueTypeDefNames());
+ TextRange typeRange = getTypeTextRange(astRoot);
+ if (typeRange != null && typeRange.touches(pos)) {
+ return getJavaCandidateNames(filter).iterator();
+ }
+ return null;
+ }
+
+ private Iterable<String> getJavaCandidateNames(Filter<String> filter) {
+ return StringTools.convertToJavaStringLiterals(this
+ .getCandidateNames(filter));
+ }
+
+ private Iterable<String> getCandidateNames(Filter<String> filter) {
+ return new FilteringIterable<String>(Arrays.asList(getPersistenceUnit()
+ .uniqueTypeDefNames()), filter);
+ }
+
/**
* @param messages
* @param reporter
13 years, 10 months
