JBoss Tools SVN: r32780 - trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink.
by jbosstools-commits@lists.jboss.org
Author: dazarov
Date: 2011-07-08 20:11:01 -0400 (Fri, 08 Jul 2011)
New Revision: 32780
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlink.java
Log:
https://issues.jboss.org/browse/JBIDE-8202
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlink.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlink.java 2011-07-09 00:10:15 UTC (rev 32779)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlink.java 2011-07-09 00:11:01 UTC (rev 32780)
@@ -118,15 +118,11 @@
path = findAndReplaceElVariable(path);
- IPath projectPath = project.getLocation();
IFile member = null;
Set<IFolder> sources = EclipseResourceUtil.getSourceFolders(file.getProject());
for (IFolder source : sources) {
- //IPath sourcePath = source.getLocation();
-
- // Look in source environment
- IPath webRootPath = source.getProjectRelativePath();//projectPath.append(sourcePath);
+ IPath webRootPath = source.getProjectRelativePath();
IPath relativePath = Utils.getRelativePath(webRootPath, basePath);
IPath filePath = relativePath.append(path);
member = project.getFolder(webRootPath).getFile(filePath);
@@ -148,8 +144,6 @@
for (IFolder source : sources) {
IPath sourcePath = source.getProjectRelativePath();
- // Look in source environment
- //IPath relativePath = Utils.getRelativePath(sourcePath, project.getLocation());
member = project.getFolder(sourcePath).getFile(path);
if(member.exists()) {
return member;
14 years, 9 months
JBoss Tools SVN: r32779 - trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink.
by jbosstools-commits@lists.jboss.org
Author: dazarov
Date: 2011-07-08 20:10:15 -0400 (Fri, 08 Jul 2011)
New Revision: 32779
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlink.java
Log:
https://issues.jboss.org/browse/JBIDE-8202
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlink.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlink.java 2011-07-08 22:05:58 UTC (rev 32778)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlink.java 2011-07-09 00:10:15 UTC (rev 32779)
@@ -126,7 +126,7 @@
//IPath sourcePath = source.getLocation();
// Look in source environment
- IPath webRootPath = source.getFullPath();//projectPath.append(sourcePath);
+ IPath webRootPath = source.getProjectRelativePath();//projectPath.append(sourcePath);
IPath relativePath = Utils.getRelativePath(webRootPath, basePath);
IPath filePath = relativePath.append(path);
member = project.getFolder(webRootPath).getFile(filePath);
@@ -146,9 +146,10 @@
Set<IFolder> sources = EclipseResourceUtil.getSourceFolders(file.getProject());
for (IFolder source : sources) {
- IPath sourcePath = source.getFullPath();
+ IPath sourcePath = source.getProjectRelativePath();
// Look in source environment
+ //IPath relativePath = Utils.getRelativePath(sourcePath, project.getLocation());
member = project.getFolder(sourcePath).getFile(path);
if(member.exists()) {
return member;
14 years, 9 months
JBoss Tools SVN: r32778 - in trunk/cdi/tests: org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: dazarov
Date: 2011-07-08 18:05:58 -0400 (Fri, 08 Jul 2011)
New Revision: 32778
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/openon/test.properties
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/openon/ResourceLoader.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CDISeamResourceLoadingHyperlinkDetectorTest.java
Log:
https://issues.jboss.org/browse/JBIDE-8202
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/openon/ResourceLoader.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/openon/ResourceLoader.java 2011-07-08 21:44:42 UTC (rev 32777)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/openon/ResourceLoader.java 2011-07-08 22:05:58 UTC (rev 32778)
@@ -12,6 +12,22 @@
@Resource("WEB-INF/beans.xml")
URL beansXml;
+ @Inject
+ @Resource("org/jboss/jsr299/tck/tests/jbt/openon/test.properties")
+ URL properties1;
+
+ @Inject
+ @Resource("org/jboss/jsr299/tck/tests/jbt/openon/test")
+ URL properties2;
+
+ @Inject
+ @Resource("org.jboss.jsr299.tck.tests.jbt.openon.test.properties")
+ URL properties3;
+
+ @Inject
+ @Resource("org.jboss.jsr299.tck.tests.jbt.openon.test")
+ URL properties4;
+
private String foo;
public ResourceLoader(String foo)
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/openon/test.properties
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/openon/test.properties (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/openon/test.properties 2011-07-08 22:05:58 UTC (rev 32778)
@@ -0,0 +1,3 @@
+header=Hello Demo Application
+prompt_message=Name:
+hello_message=Hello
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/openon/test.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CDISeamResourceLoadingHyperlinkDetectorTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CDISeamResourceLoadingHyperlinkDetectorTest.java 2011-07-08 21:44:42 UTC (rev 32777)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CDISeamResourceLoadingHyperlinkDetectorTest.java 2011-07-08 22:05:58 UTC (rev 32778)
@@ -24,11 +24,40 @@
ArrayList<TestRegion> regionList = new ArrayList<TestRegion>();
int injectPosition = text.indexOf("@Inject");
- //System.out.println("injectPosition - "+injectPosition);
if(injectPosition > 0){
regionList.add(new TestRegion(injectPosition, 58,
- new TestHyperlink[]{new TestHyperlink(CDISeamResourceLoadingHyperlink.class, NLS.bind(CDISeamExtMessages.CDI_SEAM_RESOURCE_LOADING_HYPERLINK, "WEB-INF/beans.xml", "WebContent/WEB-INF/beans.xml"))}));
+ new TestHyperlink[]{new TestHyperlink(CDISeamResourceLoadingHyperlink.class, NLS.bind(CDISeamExtMessages.CDI_SEAM_RESOURCE_LOADING_HYPERLINK,
+ "WEB-INF/beans.xml",
+ "WebContent/WEB-INF/beans.xml"))}));
}
+ injectPosition = text.indexOf("@Inject",injectPosition+1);
+ if(injectPosition > 0){
+ regionList.add(new TestRegion(injectPosition, 97,
+ new TestHyperlink[]{new TestHyperlink(CDISeamResourceLoadingHyperlink.class, NLS.bind(CDISeamExtMessages.CDI_SEAM_RESOURCE_LOADING_HYPERLINK,
+ "org/jboss/jsr299/tck/tests/jbt/openon/test.properties",
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/openon/test.properties"))}));
+ }
+ injectPosition = text.indexOf("@Inject",injectPosition+1);
+ if(injectPosition > 0){
+ regionList.add(new TestRegion(injectPosition, 86,
+ new TestHyperlink[]{new TestHyperlink(CDISeamResourceLoadingHyperlink.class, NLS.bind(CDISeamExtMessages.CDI_SEAM_RESOURCE_LOADING_HYPERLINK,
+ "org/jboss/jsr299/tck/tests/jbt/openon/test",
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/openon/test.properties"))}));
+ }
+ injectPosition = text.indexOf("@Inject",injectPosition+1);
+ if(injectPosition > 0){
+ regionList.add(new TestRegion(injectPosition, 97,
+ new TestHyperlink[]{new TestHyperlink(CDISeamResourceLoadingHyperlink.class, NLS.bind(CDISeamExtMessages.CDI_SEAM_RESOURCE_LOADING_HYPERLINK,
+ "org.jboss.jsr299.tck.tests.jbt.openon.test.properties",
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/openon/test.properties"))}));
+ }
+ injectPosition = text.indexOf("@Inject",injectPosition+1);
+ if(injectPosition > 0){
+ regionList.add(new TestRegion(injectPosition, 86,
+ new TestHyperlink[]{new TestHyperlink(CDISeamResourceLoadingHyperlink.class, NLS.bind(CDISeamExtMessages.CDI_SEAM_RESOURCE_LOADING_HYPERLINK,
+ "org.jboss.jsr299.tck.tests.jbt.openon.test",
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/openon/test.properties"))}));
+ }
CDIHyperlinkTestUtil.checkRegions(tckProject, FILENAME, regionList, new CDISeamResourceLoadingHyperlinkDetector());
}
14 years, 9 months
JBoss Tools SVN: r32777 - trunk/jsf/plugins/org.jboss.tools.jsf.
by jbosstools-commits@lists.jboss.org
Author: akazakov
Date: 2011-07-08 17:44:42 -0400 (Fri, 08 Jul 2011)
New Revision: 32777
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml
Log:
Disabled outdated JSF2 composite component validator.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 2011-07-08 21:31:37 UTC (rev 32776)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 2011-07-08 21:44:42 UTC (rev 32777)
@@ -603,7 +603,7 @@
</super>
</extension -->
- <extension
+ <!--extension
point="org.eclipse.wst.sse.ui.sourcevalidation">
<validator
class="org.jboss.tools.jsf.web.validation.jsf2.JSF2SourceValidator"
@@ -626,7 +626,7 @@
<partitionType id="org.eclipse.jst.jsp.DEFAULT_JSP"/>
</contentTypeIdentifier>
</validator>
- </extension>
+ </extension-->
<!--
<extension
14 years, 9 months
JBoss Tools SVN: r32776 - trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink.
by jbosstools-commits@lists.jboss.org
Author: dazarov
Date: 2011-07-08 17:31:37 -0400 (Fri, 08 Jul 2011)
New Revision: 32776
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlink.java
Log:
https://issues.jboss.org/browse/JBIDE-8202
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlink.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlink.java 2011-07-08 20:16:59 UTC (rev 32775)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlink.java 2011-07-08 21:31:37 UTC (rev 32776)
@@ -27,6 +27,7 @@
import org.jboss.tools.common.text.ext.util.Utils;
public class CDISeamResourceLoadingHyperlink extends AbstractHyperlink{
+ private final static String PROPERTIES = ".properties";
private IRegion region;
private String path;
private IFile file;
@@ -50,16 +51,49 @@
@Override
public IFile getReadyToOpenFile(){
- IFile result = getFileFromProject(path);
+ String fileName = path;
+
+ IFile result = searchFile(fileName);
if(result != null && result.exists())
return result;
+ fileName = replaceDots(fileName);
+ result = searchFile(fileName);
+ if(result != null && result.exists())
+ return result;
+
+ fileName = path;
+ fileName += PROPERTIES;
+ fileName = replaceDots(fileName);
+ return searchFile(fileName);
+ }
+
+ private String replaceDots(String name){
+ String fileName = name;
+ int propIndex = fileName.lastIndexOf(".");
+ if(propIndex < 0)
+ return fileName;
+
+ String extension = fileName.substring(propIndex);
+
+ fileName = fileName.substring(0, propIndex);
+ fileName = fileName.replace(".", "/");
+ fileName += extension;
+
+ return fileName;
+ }
+
+ public IFile searchFile(String fileName){
+ IFile result = getFileFromProject(fileName);
+ if(result != null && result.exists())
+ return result;
+
if(file == null || !file.isAccessible()) return null;
- path = findAndReplaceElVariable(path);
+ fileName = findAndReplaceElVariable(fileName);
IProject project = file.getProject();
- String name = Utils.trimFilePath(path);
+ String name = Utils.trimFilePath(fileName);
IPath currentPath = file.getLocation().removeLastSegments(1);
IResource member = null;
14 years, 9 months
JBoss Tools SVN: r32775 - trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink.
by jbosstools-commits@lists.jboss.org
Author: dazarov
Date: 2011-07-08 16:16:59 -0400 (Fri, 08 Jul 2011)
New Revision: 32775
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlink.java
Log:
https://issues.jboss.org/browse/JBIDE-8202
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlink.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlink.java 2011-07-08 17:23:50 UTC (rev 32774)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlink.java 2011-07-08 20:16:59 UTC (rev 32775)
@@ -10,13 +10,21 @@
******************************************************************************/
package org.jboss.tools.cdi.seam.text.ext.hyperlink;
+import java.util.Set;
+
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
import org.eclipse.osgi.util.NLS;
import org.eclipse.ui.IEditorPart;
import org.jboss.tools.cdi.seam.text.ext.CDISeamExtMessages;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
+import org.jboss.tools.common.text.ext.util.Utils;
public class CDISeamResourceLoadingHyperlink extends AbstractHyperlink{
private IRegion region;
@@ -42,9 +50,80 @@
@Override
public IFile getReadyToOpenFile(){
- return getFileFromProject(path);
+ IFile result = getFileFromProject(path);
+ if(result != null && result.exists())
+ return result;
+
+ if(file == null || !file.isAccessible()) return null;
+
+ path = findAndReplaceElVariable(path);
+
+ IProject project = file.getProject();
+ String name = Utils.trimFilePath(path);
+ IPath currentPath = file.getLocation().removeLastSegments(1);
+ IResource member = null;
+
+ if (name.startsWith("/")) { //$NON-NLS-1$
+ member = findByAbsolutePath(project, name);
+ } else {
+ member = findByRelativePath(project, currentPath, name);
+ if (member == null && name.length() > 0) {
+ member = findByAbsolutePath(project, "/" + name); //$NON-NLS-1$
+ }
+ }
+ if (member != null && (member instanceof IFile)) {
+ if (((IFile) member).exists())
+ return (IFile) member;
+ }
+ return null;
}
+
+ private IFile findByRelativePath(IProject project, IPath basePath, String path) {
+ if (path == null || path.trim().length() == 0)
+ return null;
+
+ path = findAndReplaceElVariable(path);
+
+ IPath projectPath = project.getLocation();
+ IFile member = null;
+ Set<IFolder> sources = EclipseResourceUtil.getSourceFolders(file.getProject());
+ for (IFolder source : sources) {
+ //IPath sourcePath = source.getLocation();
+
+ // Look in source environment
+ IPath webRootPath = source.getFullPath();//projectPath.append(sourcePath);
+ IPath relativePath = Utils.getRelativePath(webRootPath, basePath);
+ IPath filePath = relativePath.append(path);
+ member = project.getFolder(webRootPath).getFile(filePath);
+ if (member.exists()) {
+ return member;
+ }
+
+ }
+ return null;
+ }
+
+ private IFile findByAbsolutePath(IProject project, String path) {
+
+ path = findAndReplaceElVariable(path);
+
+ IFile member = null;
+
+ Set<IFolder> sources = EclipseResourceUtil.getSourceFolders(file.getProject());
+ for (IFolder source : sources) {
+ IPath sourcePath = source.getFullPath();
+
+ // Look in source environment
+ member = project.getFolder(sourcePath).getFile(path);
+ if(member.exists()) {
+ return member;
+ }
+
+ }
+ return null;
+ }
+
@Override
protected void doHyperlink(IRegion region) {
IFile file = getReadyToOpenFile();
14 years, 9 months
JBoss Tools SVN: r32774 - in trunk/jsf/plugins: org.jboss.tools.jsf.vpe.facelets/META-INF and 6 other directories.
by jbosstools-commits@lists.jboss.org
Author: yradtsevich
Date: 2011-07-08 13:23:50 -0400 (Fri, 08 Jul 2011)
New Revision: 32774
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/META-INF/MANIFEST.MF
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/META-INF/MANIFEST.MF
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jbpm/META-INF/MANIFEST.MF
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/META-INF/MANIFEST.MF
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/META-INF/MANIFEST.MF
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.myfaces/META-INF/MANIFEST.MF
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/META-INF/MANIFEST.MF
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/META-INF/MANIFEST.MF
Log:
https://issues.jboss.org/browse/JBIDE-8881 : Move VPE.JSF templates plugins up to baseline
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/META-INF/MANIFEST.MF 2011-07-08 17:15:09 UTC (rev 32773)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/META-INF/MANIFEST.MF 2011-07-08 17:23:50 UTC (rev 32774)
@@ -6,13 +6,13 @@
Bundle-Version: 3.1.0.qualifier
Bundle-Localization: plugin
Require-Bundle: org.jboss.tools.vpe,
- org.eclipse.ui,
- org.eclipse.core.runtime,
+ org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.core.runtime;bundle-version="3.7.0",
org.jboss.tools.jst.jsp,
org.mozilla.xpcom,
- org.jboss.tools.jsf.vpe.richfaces;bundle-version="2.1.0",
- org.jboss.tools.jsf.vpe.jsf;bundle-version="2.1.0",
- org.eclipse.jface.text;bundle-version="3.5.0"
+ org.jboss.tools.jsf.vpe.richfaces,
+ org.jboss.tools.jsf.vpe.jsf,
+ org.eclipse.jface.text;bundle-version="3.7.0"
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Bundle-Vendor.0
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/META-INF/MANIFEST.MF 2011-07-08 17:15:09 UTC (rev 32773)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/META-INF/MANIFEST.MF 2011-07-08 17:23:50 UTC (rev 32774)
@@ -7,14 +7,14 @@
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.jboss.tools.jsf.vpe.facelets; singleton:=true
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
+Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.core.runtime;bundle-version="3.7.0",
org.jboss.tools.common,
org.jboss.tools.vpe,
- org.eclipse.core.resources,
+ org.eclipse.core.resources;bundle-version="3.7.100",
org.jboss.tools.jst.jsp,
org.mozilla.xpcom,
- org.eclipse.jface.text;bundle-version="3.5.0"
+ org.eclipse.jface.text;bundle-version="3.7.0"
Export-Package: org.jboss.tools.jsf.vpe.facelets,
org.jboss.tools.jsf.vpe.facelets.template
Bundle-Version: 3.1.0.qualifier
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jbpm/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jbpm/META-INF/MANIFEST.MF 2011-07-08 17:15:09 UTC (rev 32773)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jbpm/META-INF/MANIFEST.MF 2011-07-08 17:23:50 UTC (rev 32774)
@@ -4,14 +4,14 @@
Bundle-SymbolicName: org.jboss.tools.jsf.vpe.jbpm;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.jboss.tools.jsf.vpe.jbpm.JBPMTemplatePlugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
+Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.core.runtime;bundle-version="3.7.0",
org.jboss.tools.vpe.html,
org.mozilla.xpcom,
org.jboss.tools.vpe,
org.jboss.tools.jsf.vpe.jsf,
org.jboss.tools.common,
- org.eclipse.jface.text,
+ org.eclipse.jface.text;bundle-version="3.7.0",
org.jboss.tools.jst.jsp
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/META-INF/MANIFEST.MF 2011-07-08 17:15:09 UTC (rev 32773)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/META-INF/MANIFEST.MF 2011-07-08 17:23:50 UTC (rev 32774)
@@ -5,20 +5,20 @@
Bundle-Version: 3.3.0.qualifier
Bundle-Activator: org.jboss.tools.jsf.vpe.jsf.JsfTemplatePlugin
Bundle-Vendor: %providerName
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
+Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.core.runtime;bundle-version="3.7.0",
org.jboss.tools.common,
org.jboss.tools.vpe,
org.mozilla.xpcom,
org.jboss.tools.jst.web,
org.jboss.tools.jst.jsp,
- org.eclipse.wst.sse.core,
- org.eclipse.jst.jsp.core,
- org.eclipse.wst.html.core,
+ org.eclipse.wst.sse.core;bundle-version="1.1.600",
+ org.eclipse.jst.jsp.core;bundle-version="1.2.400",
+ org.eclipse.wst.html.core;bundle-version="1.1.500",
org.jboss.tools.vpe.html,
org.jboss.tools.jsf,
- org.eclipse.ui.ide,
- org.eclipse.ui.editors,
+ org.eclipse.ui.ide;bundle-version="3.7.0",
+ org.eclipse.ui.editors;bundle-version="3.7.0",
org.jboss.tools.vpe.xulrunner
Bundle-ActivationPolicy: lazy
Export-Package: org.jboss.tools.jsf.vpe.jsf.template,
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/META-INF/MANIFEST.MF 2011-07-08 17:15:09 UTC (rev 32773)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/META-INF/MANIFEST.MF 2011-07-08 17:23:50 UTC (rev 32774)
@@ -5,17 +5,17 @@
Bundle-Version: 3.1.0.qualifier
Bundle-Activator: org.jboss.tools.jsf.vpe.jstl.JstlTemplatePlugin
Bundle-Vendor: %providerName
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
+Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.core.runtime;bundle-version="3.7.0",
org.jboss.tools.common,
org.jboss.tools.vpe,
org.mozilla.xpcom,
org.jboss.tools.jst.jsp,
- org.eclipse.wst.sse.core,
- org.eclipse.jst.jsp.core,
- org.eclipse.wst.html.core,
+ org.eclipse.wst.sse.core;bundle-version="1.1.600",
+ org.eclipse.jst.jsp.core;bundle-version="1.2.400",
+ org.eclipse.wst.html.core;bundle-version="1.1.500",
org.jboss.tools.vpe.html,
- org.jboss.tools.jsf.vpe.jsf;bundle-version="2.1.0"
+ org.jboss.tools.jsf.vpe.jsf
Bundle-ActivationPolicy: lazy
Export-Package: org.jboss.tools.jsf.vpe.jstl.template
Bundle-Localization: plugin
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.myfaces/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.myfaces/META-INF/MANIFEST.MF 2011-07-08 17:15:09 UTC (rev 32773)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.myfaces/META-INF/MANIFEST.MF 2011-07-08 17:23:50 UTC (rev 32774)
@@ -5,13 +5,13 @@
Bundle-Version: 3.1.0.qualifier
Bundle-Activator: org.jboss.tools.jsf.vpe.myfaces.MyFacesTemplatesPlugin
Bundle-Vendor: %Bundle-Vendor.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
+Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.core.runtime;bundle-version="3.7.0",
org.jboss.tools.common,
org.jboss.tools.vpe,
org.mozilla.xpcom,
org.jboss.tools.jst.jsp,
- org.eclipse.jface.text;bundle-version="3.5.0"
+ org.eclipse.jface.text;bundle-version="3.7.0"
Bundle-ActivationPolicy: lazy
Export-Package: org.jboss.tools.jsf.vpe.myfaces,
org.jboss.tools.jsf.vpe.myfaces.template
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/META-INF/MANIFEST.MF 2011-07-08 17:15:09 UTC (rev 32773)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/META-INF/MANIFEST.MF 2011-07-08 17:23:50 UTC (rev 32774)
@@ -5,16 +5,16 @@
Bundle-Activator: org.jboss.tools.jsf.vpe.richfaces.RichFacesTemplatesActivator
Bundle-Version: 3.3.0.qualifier
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
+Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.core.runtime;bundle-version="3.7.0",
org.jboss.tools.vpe,
org.jboss.tools.jst.jsp,
org.jboss.tools.common.model,
- org.eclipse.wst.sse.ui,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ui.ide,
+ org.eclipse.wst.sse.ui;bundle-version="1.3.0",
+ org.eclipse.ui.workbench.texteditor;bundle-version="3.7.0",
+ org.eclipse.ui.ide;bundle-version="3.7.0",
org.mozilla.xpcom,
- org.eclipse.wst.sse.core,
+ org.eclipse.wst.sse.core;bundle-version="1.1.600",
org.jboss.tools.vpe.xulrunner,
org.jboss.tools.jsf.vpe.facelets,
org.jboss.tools.jsf.vpe.jsf
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/META-INF/MANIFEST.MF 2011-07-08 17:15:09 UTC (rev 32773)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/META-INF/MANIFEST.MF 2011-07-08 17:23:50 UTC (rev 32774)
@@ -5,18 +5,18 @@
Bundle-Activator: org.jboss.tools.jsf.vpe.seam.SeamTemplatesActivator
Bundle-Version: 3.2.0.qualifier
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
+Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.core.runtime;bundle-version="3.7.0",
org.jboss.tools.vpe,
org.jboss.tools.jst.jsp,
org.jboss.tools.common.model,
- org.eclipse.wst.sse.ui,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ui.ide,
+ org.eclipse.wst.sse.ui;bundle-version="1.3.0",
+ org.eclipse.ui.workbench.texteditor;bundle-version="3.7.0",
+ org.eclipse.ui.ide;bundle-version="3.7.0",
org.mozilla.xpcom,
- org.jboss.tools.jsf.vpe.jsf;bundle-version="2.1.0",
- org.eclipse.jface.text;bundle-version="3.5.0",
- org.eclipse.wst.sse.core;bundle-version="1.1.4",
+ org.jboss.tools.jsf.vpe.jsf,
+ org.eclipse.jface.text;bundle-version="3.7.0",
+ org.eclipse.wst.sse.core;bundle-version="1.1.600",
org.jboss.tools.vpe.xulrunner
Bundle-Vendor: %Bundle-Vendor.0
Bundle-ActivationPolicy: lazy
14 years, 9 months
JBoss Tools SVN: r32773 - trunk/struts/plugins/org.jboss.tools.struts.vpe.struts/META-INF.
by jbosstools-commits@lists.jboss.org
Author: yradtsevich
Date: 2011-07-08 13:15:09 -0400 (Fri, 08 Jul 2011)
New Revision: 32773
Modified:
trunk/struts/plugins/org.jboss.tools.struts.vpe.struts/META-INF/MANIFEST.MF
Log:
https://issues.jboss.org/browse/JBIDE-8882 : Move VPE.Struts templates plugins up to baseline
Modified: trunk/struts/plugins/org.jboss.tools.struts.vpe.struts/META-INF/MANIFEST.MF
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.vpe.struts/META-INF/MANIFEST.MF 2011-07-08 17:14:07 UTC (rev 32772)
+++ trunk/struts/plugins/org.jboss.tools.struts.vpe.struts/META-INF/MANIFEST.MF 2011-07-08 17:15:09 UTC (rev 32773)
@@ -3,8 +3,8 @@
Bundle-Name: %bundleName
Bundle-SymbolicName: org.jboss.tools.struts.vpe.struts;singleton:=true
Bundle-Version: 3.1.0.qualifier
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
+Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.core.runtime;bundle-version="3.7.0",
org.jboss.tools.vpe
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %vendorName
14 years, 9 months
JBoss Tools SVN: r32772 - in trunk/vpe/plugins: org.jboss.tools.vpe.base.test/META-INF and 8 other directories.
by jbosstools-commits@lists.jboss.org
Author: yradtsevich
Date: 2011-07-08 13:14:07 -0400 (Fri, 08 Jul 2011)
New Revision: 32772
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.base.test/META-INF/MANIFEST.MF
trunk/vpe/plugins/org.jboss.tools.vpe.docbook/META-INF/MANIFEST.MF
trunk/vpe/plugins/org.jboss.tools.vpe.html/META-INF/MANIFEST.MF
trunk/vpe/plugins/org.jboss.tools.vpe.jsp/META-INF/MANIFEST.MF
trunk/vpe/plugins/org.jboss.tools.vpe.resref/META-INF/MANIFEST.MF
trunk/vpe/plugins/org.jboss.tools.vpe.spring/META-INF/MANIFEST.MF
trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/META-INF/MANIFEST.MF
trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/META-INF/MANIFEST.MF
trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF
trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/META-INF/MANIFEST.MF
Log:
https://issues.jboss.org/browse/JBIDE-9312 : Move VPE plugins up to baseline
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF 2011-07-08 16:05:56 UTC (rev 32771)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF 2011-07-08 17:14:07 UTC (rev 32772)
@@ -36,31 +36,31 @@
org.jboss.tools.vpe.editor.xpl,
org.jboss.tools.vpe.handlers,
org.jboss.tools.vpe.messages
-Require-Bundle: org.eclipse.jface.text,
+Require-Bundle: org.eclipse.jface.text;bundle-version="3.7.0",
org.jboss.tools.jst.jsp,
org.jboss.tools.jst.web,
- org.eclipse.wst.xml.ui,
- org.eclipse.compare,
- org.eclipse.wst.common.ui,
- org.eclipse.ui,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ui.views,
- org.eclipse.ui.ide,
+ org.eclipse.wst.xml.ui;bundle-version="1.1.200",
+ org.eclipse.compare;bundle-version="3.5.200",
+ org.eclipse.wst.common.ui;bundle-version="1.1.500",
+ org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.ui.workbench.texteditor;bundle-version="3.7.0",
+ org.eclipse.ui.views;bundle-version="3.6.0",
+ org.eclipse.ui.ide;bundle-version="3.7.0",
org.jboss.tools.vpe.xulrunner,
org.mozilla.xpcom,
- org.eclipse.draw2d,
+ org.eclipse.draw2d;bundle-version="3.7.0",
org.jboss.tools.jst.web;visibility:=reexport,
org.jboss.tools.vpe.resref,
org.jboss.tools.common.el.core,
org.jboss.tools.common.el.ui,
org.jboss.tools.jst.web.kb,
- org.eclipse.jdt.ui,
- org.eclipse.wst.sse.ui,
- org.eclipse.wst.sse.core,
- org.eclipse.core.expressions,
+ org.eclipse.jdt.ui;bundle-version="3.7.0",
+ org.eclipse.wst.sse.ui;bundle-version="1.3.0",
+ org.eclipse.wst.sse.core;bundle-version="1.1.600",
+ org.eclipse.core.expressions;bundle-version="3.4.200",
org.jboss.tools.common.model.ui,
- org.eclipse.wst.xml.xpath.core,
- org.jboss.tools.jst.css;bundle-version="3.2.0",
- org.eclipse.wst.common.snippets
+ org.eclipse.wst.xml.xpath.core;bundle-version="1.1.100",
+ org.jboss.tools.jst.css,
+ org.eclipse.wst.common.snippets;bundle-version="1.2.100"
Bundle-Version: 3.3.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.base.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.base.test/META-INF/MANIFEST.MF 2011-07-08 16:05:56 UTC (rev 32771)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.base.test/META-INF/MANIFEST.MF 2011-07-08 17:14:07 UTC (rev 32772)
@@ -5,24 +5,24 @@
Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: JBoss by RedHat
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.eclipse.ui;bundle-version="[3.6.0,4.0.0)",
- org.junit,
- org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
- org.jboss.tools.common;bundle-version="3.2.0",
- org.eclipse.core.resources;bundle-version="[3.6.0,4.0.0)",
- org.jboss.tools.tests;bundle-version="3.1.0",
- org.eclipse.jface.text;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.wst.sse.core;bundle-version="1.1.500",
- org.eclipse.wst.sse.ui;bundle-version="1.2.0",
- org.jboss.tools.vpe;bundle-version="3.2.0",
- org.eclipse.ui.ide;bundle-version="[3.6.0,4.0.0)",
- org.jboss.tools.jst.jsp;bundle-version="3.2.0",
- org.eclipse.wst.xml.xpath.core,
- org.mozilla.xpcom;bundle-version="1.9.1",
- org.jboss.tools.vpe.xulrunner;bundle-version="3.2.0",
- org.jboss.tools.common.text.ext;bundle-version="3.2.0",
- org.jboss.tools.common.model.ui;bundle-version="3.2.0",
- org.jboss.tools.jst.css;bundle-version="3.2.0"
+Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
+ org.junit;bundle-version="3.8.2",
+ org.eclipse.core.runtime;bundle-version="3.7.0",
+ org.jboss.tools.common,
+ org.eclipse.core.resources;bundle-version="3.7.100",
+ org.jboss.tools.tests,
+ org.eclipse.jface.text;bundle-version="3.7.0",
+ org.eclipse.wst.sse.core;bundle-version="1.1.600",
+ org.eclipse.wst.sse.ui;bundle-version="1.3.0",
+ org.jboss.tools.vpe,
+ org.eclipse.ui.ide;bundle-version="3.7.0",
+ org.jboss.tools.jst.jsp,
+ org.eclipse.wst.xml.xpath.core;bundle-version="1.1.100",
+ org.mozilla.xpcom,
+ org.jboss.tools.vpe.xulrunner,
+ org.jboss.tools.common.text.ext,
+ org.jboss.tools.common.model.ui,
+ org.jboss.tools.jst.css
Export-Package: org.jboss.tools.vpe.base.test
Bundle-Activator: org.jboss.tools.vpe.base.test.VPEBaseTestPlugin
Bundle-ActivationPolicy: lazy
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.docbook/META-INF/MANIFEST.MF 2011-07-08 16:05:56 UTC (rev 32771)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.docbook/META-INF/MANIFEST.MF 2011-07-08 17:14:07 UTC (rev 32772)
@@ -3,11 +3,11 @@
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.jboss.tools.vpe.docbook;singleton:=true
Bundle-Version: 3.3.0.qualifier
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
+Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.core.runtime;bundle-version="3.7.0",
org.jboss.tools.jst.jsp,
org.mozilla.xpcom,
- org.eclipse.jface.text,
+ org.eclipse.jface.text;bundle-version="3.7.0",
org.jboss.tools.vpe
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Bundle-Vendor.0
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.html/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.html/META-INF/MANIFEST.MF 2011-07-08 16:05:56 UTC (rev 32771)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.html/META-INF/MANIFEST.MF 2011-07-08 17:14:07 UTC (rev 32772)
@@ -5,13 +5,13 @@
Bundle-Version: 3.3.0.qualifier
Bundle-Activator: org.jboss.tools.vpe.html.HtmlTemplatePlugin
Bundle-Vendor: %providerName
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
+Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.core.runtime;bundle-version="3.7.0",
org.jboss.tools.vpe,
org.mozilla.xpcom,
org.jboss.tools.jst.jsp,
org.jboss.tools.common,
- org.eclipse.jface.text,
+ org.eclipse.jface.text;bundle-version="3.7.0",
org.jboss.tools.vpe.xulrunner
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.jsp/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.jsp/META-INF/MANIFEST.MF 2011-07-08 16:05:56 UTC (rev 32771)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.jsp/META-INF/MANIFEST.MF 2011-07-08 17:14:07 UTC (rev 32772)
@@ -5,11 +5,11 @@
Bundle-Version: 3.1.0.qualifier
Bundle-Activator: org.jboss.tools.vpe.jsp.JspTemplatePluign
Bundle-Vendor: %providerName
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
+Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.core.runtime;bundle-version="3.7.0",
org.jboss.tools.vpe,
org.mozilla.xpcom,
- org.eclipse.core.resources,
+ org.eclipse.core.resources;bundle-version="3.7.100",
org.jboss.tools.jst.jsp,
org.jboss.tools.common
Bundle-ActivationPolicy: lazy
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.resref/META-INF/MANIFEST.MF 2011-07-08 16:05:56 UTC (rev 32771)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/META-INF/MANIFEST.MF 2011-07-08 17:14:07 UTC (rev 32772)
@@ -6,13 +6,13 @@
Bundle-Version: 3.2.0.qualifier
Bundle-ManifestVersion: 2
Bundle-Activator: org.jboss.tools.vpe.resref.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
+Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.core.runtime;bundle-version="3.7.0",
org.jboss.tools.common.model.ui,
- org.eclipse.core.resources,
+ org.eclipse.core.resources;bundle-version="3.7.100",
org.jboss.tools.jst.web,
- org.jboss.tools.common.resref.core;bundle-version="1.0.0",
- org.jboss.tools.common.resref.ui;bundle-version="1.0.0";visibility:=reexport,
+ org.jboss.tools.common.resref.core,
+ org.jboss.tools.common.resref.ui;visibility:=reexport,
org.jboss.tools.common.el.core;bundle-version="2.0.0"
Bundle-ActivationPolicy: lazy
Export-Package: org.jboss.tools.vpe.resref,
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.spring/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.spring/META-INF/MANIFEST.MF 2011-07-08 16:05:56 UTC (rev 32771)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.spring/META-INF/MANIFEST.MF 2011-07-08 17:14:07 UTC (rev 32772)
@@ -4,11 +4,11 @@
Bundle-SymbolicName: org.jboss.tools.vpe.spring;singleton:=true
Bundle-Version: 3.3.0.qualifier
Bundle-Activator: org.jboss.tools.vpe.spring.SpringTemplatePlugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
+Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.core.runtime;bundle-version="3.7.0",
org.jboss.tools.vpe,
org.mozilla.xpcom,
- org.eclipse.jface.text,
+ org.eclipse.jface.text;bundle-version="3.7.0",
org.jboss.tools.jst.jsp
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %vendorName
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/META-INF/MANIFEST.MF 2011-07-08 16:05:56 UTC (rev 32771)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/META-INF/MANIFEST.MF 2011-07-08 17:14:07 UTC (rev 32772)
@@ -9,10 +9,10 @@
Export-Package: org.jboss.tools.vpe.ui.palette,
org.jboss.tools.vpe.ui.palette.model,
org.jboss.tools.vpe.ui.palette.wizard
-Require-Bundle: org.eclipse.ui.ide,
- org.eclipse.jface.text,
- org.eclipse.ui,
- org.eclipse.gef,
+Require-Bundle: org.eclipse.ui.ide;bundle-version="3.7.0",
+ org.eclipse.jface.text;bundle-version="3.7.0",
+ org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.gef;bundle-version="3.7.0",
org.jboss.tools.common.model.ui,
org.jboss.tools.jst.web,
org.jboss.tools.jst.jsp
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/META-INF/MANIFEST.MF 2011-07-08 16:05:56 UTC (rev 32771)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/META-INF/MANIFEST.MF 2011-07-08 17:14:07 UTC (rev 32772)
@@ -4,9 +4,9 @@
Bundle-SymbolicName: org.jboss.tools.vpe.xulrunner;singleton:=true
Bundle-Version: 3.3.0.qualifier
Bundle-Activator: org.jboss.tools.vpe.xulrunner.BrowserPlugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.mozilla.xpcom,
+Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.core.runtime;bundle-version="3.7.0",
+ org.mozilla.xpcom;bundle-version="1.9.1",
org.jboss.tools.common,
org.mozilla.xulrunner.cocoa.macosx;resolution:=optional,
org.mozilla.xulrunner.gtk.linux.x86;resolution:=optional,
Modified: trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/META-INF/MANIFEST.MF 2011-07-08 16:05:56 UTC (rev 32771)
+++ trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/META-INF/MANIFEST.MF 2011-07-08 17:14:07 UTC (rev 32772)
@@ -5,6 +5,6 @@
Bundle-Version: 3.1.0.qualifier
Bundle-Vendor: %BundleVendor
Fragment-Host: org.eclipse.swt
-Require-Bundle: org.eclipse.core.runtime
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0"
Bundle-Localization: initializer
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
14 years, 9 months
JBoss Tools SVN: r32771 - in trunk/as: plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration and 2 other directories.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-07-08 12:05:56 -0400 (Fri, 08 Jul 2011)
New Revision: 32771
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/AbstractStartLaunchConfigurator.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/LocalJBossStartLaunchConfigurator.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartConfigurator.java
Removed:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/AbstractStartupConfigurator.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/LocalJBossStartupConfigurator.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartupConfigurator.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossStartLaunchDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartLaunchDelegate.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/launch/LaunchConfigConfiguratorFactory.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/launch/LaunchConfigTests.java
Log:
[JBIDE-9215] renamed AbstractStartupConfigurator to AbstractStartLaunchConfigurator (and all subclasses) to have consistent naming scheme with launch delegates
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java 2011-07-08 15:41:23 UTC (rev 32770)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java 2011-07-08 16:05:56 UTC (rev 32771)
@@ -32,7 +32,7 @@
import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossBehaviorDelegate;
import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration.StartLaunchDelegate;
import org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties;
-import org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.LocalJBossStartupConfigurator;
+import org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.LocalJBossStartLaunchConfigurator;
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants;
import org.jboss.ide.eclipse.as.core.util.JBossServerBehaviorUtils;
import org.jboss.ide.eclipse.as.core.util.LaunchCommandPreferences;
@@ -52,7 +52,7 @@
public void setupLaunchConfiguration(
ILaunchConfigurationWorkingCopy workingCopy, IServer server) throws CoreException {
- new LocalJBossStartupConfigurator(server).configure(workingCopy);
+ new LocalJBossStartLaunchConfigurator(server).configure(workingCopy);
}
public static class JBossServerDefaultClasspathProvider extends StandardClasspathProvider {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossStartLaunchDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossStartLaunchDelegate.java 2011-07-08 15:41:23 UTC (rev 32770)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossStartLaunchDelegate.java 2011-07-08 16:05:56 UTC (rev 32771)
@@ -28,7 +28,7 @@
import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior;
import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossBehaviorDelegate;
import org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties;
-import org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.LocalJBossStartupConfigurator;
+import org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.LocalJBossStartLaunchConfigurator;
import org.jboss.ide.eclipse.as.core.util.JBossServerBehaviorUtils;
import org.jboss.ide.eclipse.as.core.util.LaunchConfigUtils;
@@ -40,7 +40,7 @@
public void setupLaunchConfiguration(
ILaunchConfigurationWorkingCopy workingCopy, IServer server) throws CoreException {
- new LocalJBossStartupConfigurator(server).configure(workingCopy);
+ new LocalJBossStartLaunchConfigurator(server).configure(workingCopy);
}
/*
Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/AbstractStartLaunchConfigurator.java (from rev 32689, trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/AbstractStartupConfigurator.java)
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/AbstractStartLaunchConfigurator.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/AbstractStartLaunchConfigurator.java 2011-07-08 16:05:56 UTC (rev 32771)
@@ -0,0 +1,91 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.ide.eclipse.as.core.server.internal.launch.configuration;
+
+import java.util.Map;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.jdt.launching.IVMInstall;
+import org.eclipse.jdt.launching.JavaRuntime;
+import org.eclipse.wst.server.core.IServer;
+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.IJBossRuntimeResourceConstants;
+
+/**
+ * @author André Dietisheim
+ */
+public abstract class AbstractStartLaunchConfigurator extends AbstractLaunchConfigurator {
+
+ private static final String DEFAULT_CP_PROVIDER_ID = "org.jboss.ide.eclipse.as.core.server.internal.launch.serverClasspathProvider"; ///$NON-NLS-1$
+
+ public AbstractStartLaunchConfigurator(IServer server) throws CoreException {
+ super(server);
+ }
+
+ @Override
+ protected void doConfigure(ILaunchConfigurationWorkingCopy launchConfig, JBossServer jbossServer, IJBossServerRuntime jbossRuntime) throws CoreException {
+ JBossLaunchConfigProperties.setProgramArguments(getDefaultProgramArguments(jbossServer, jbossRuntime), launchConfig);
+ JBossLaunchConfigProperties.setHost(getHost(jbossServer, jbossRuntime), launchConfig);
+ JBossLaunchConfigProperties.setConfig(getServerConfig(jbossRuntime), launchConfig);
+ JBossLaunchConfigProperties.setServerHome(getServerHome(jbossRuntime), jbossRuntime, launchConfig);
+ JBossLaunchConfigProperties.setVmArguments(getDefaultVMArguments(jbossRuntime), launchConfig);
+ JBossLaunchConfigProperties.setJreContainer(getJreContainerPath(jbossRuntime), launchConfig);
+ JBossLaunchConfigProperties.setEndorsedDir(getEndorsedDir(jbossRuntime), launchConfig);
+ JBossLaunchConfigProperties.setMainType(getMainType(), launchConfig);
+ JBossLaunchConfigProperties.setWorkingDirectory(getWorkingDirectory(jbossServer, jbossRuntime), launchConfig);
+ JBossLaunchConfigProperties.setEnvironmentVariables(getEnvironmentVariables(jbossRuntime), launchConfig);
+ JBossLaunchConfigProperties.setClasspathProvider(getClasspathProvider(), launchConfig);
+ JBossLaunchConfigProperties.setClasspath(getClasspath(jbossServer, jbossRuntime, JBossLaunchConfigProperties.getClasspath(launchConfig)), launchConfig);
+ JBossLaunchConfigProperties.setUseDefaultClassPath(isUseDefaultClasspath(), launchConfig);
+ JBossLaunchConfigProperties.setServerId(getServerId(jbossServer), launchConfig);
+ }
+
+
+ protected abstract String getEndorsedDir(IJBossServerRuntime runtime);
+
+ protected abstract String getServerConfig(IJBossServerRuntime runtime);
+
+ protected abstract String getServerHome(IJBossServerRuntime runtime);
+
+ private void setServerHome(String serverHome, IJBossServerRuntime runtime,
+ ILaunchConfigurationWorkingCopy launchConfig) throws CoreException {
+ if (!isCustomConfigLocation(runtime)) {
+ JBossLaunchConfigProperties.setServerHome(serverHome, runtime, launchConfig);
+ }
+ }
+
+ protected boolean isCustomConfigLocation(IJBossServerRuntime runtime) {
+ return runtime.getConfigLocation().equals(IJBossRuntimeResourceConstants.SERVER);
+ }
+
+ protected String getClasspathProvider() {
+ return DEFAULT_CP_PROVIDER_ID;
+ }
+
+ protected Map<String, String> getEnvironmentVariables(IJBossServerRuntime runtime) {
+ return runtime.getDefaultRunEnvVars();
+ }
+
+ protected abstract String getDefaultVMArguments(IJBossServerRuntime runtime);
+
+
+ protected String getJreContainerPath(IJBossServerRuntime runtime) {
+ IVMInstall vmInstall = runtime.getVM();
+ if (vmInstall == null) {
+ return null;
+ }
+ return JavaRuntime.newJREContainerPath(vmInstall).toPortableString();
+ }
+
+ protected abstract String getHost(JBossServer server, IJBossServerRuntime runtime);
+}
\ No newline at end of file
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/AbstractStartLaunchConfigurator.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/AbstractStartupConfigurator.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/AbstractStartupConfigurator.java 2011-07-08 15:41:23 UTC (rev 32770)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/AbstractStartupConfigurator.java 2011-07-08 16:05:56 UTC (rev 32771)
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.ide.eclipse.as.core.server.internal.launch.configuration;
-
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.wst.server.core.IServer;
-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.IJBossRuntimeResourceConstants;
-
-/**
- * @author André Dietisheim
- */
-public abstract class AbstractStartupConfigurator extends AbstractLaunchConfigurator {
-
- private static final String DEFAULT_CP_PROVIDER_ID = "org.jboss.ide.eclipse.as.core.server.internal.launch.serverClasspathProvider"; ///$NON-NLS-1$
-
- public AbstractStartupConfigurator(IServer server) throws CoreException {
- super(server);
- }
-
- @Override
- protected void doConfigure(ILaunchConfigurationWorkingCopy launchConfig, JBossServer jbossServer, IJBossServerRuntime jbossRuntime) throws CoreException {
- JBossLaunchConfigProperties.setProgramArguments(getDefaultProgramArguments(jbossServer, jbossRuntime), launchConfig);
- JBossLaunchConfigProperties.setHost(getHost(jbossServer, jbossRuntime), launchConfig);
- JBossLaunchConfigProperties.setConfig(getServerConfig(jbossRuntime), launchConfig);
- JBossLaunchConfigProperties.setServerHome(getServerHome(jbossRuntime), jbossRuntime, launchConfig);
- JBossLaunchConfigProperties.setVmArguments(getDefaultVMArguments(jbossRuntime), launchConfig);
- JBossLaunchConfigProperties.setJreContainer(getJreContainerPath(jbossRuntime), launchConfig);
- JBossLaunchConfigProperties.setEndorsedDir(getEndorsedDir(jbossRuntime), launchConfig);
- JBossLaunchConfigProperties.setMainType(getMainType(), launchConfig);
- JBossLaunchConfigProperties.setWorkingDirectory(getWorkingDirectory(jbossServer, jbossRuntime), launchConfig);
- JBossLaunchConfigProperties.setEnvironmentVariables(getEnvironmentVariables(jbossRuntime), launchConfig);
- JBossLaunchConfigProperties.setClasspathProvider(getClasspathProvider(), launchConfig);
- JBossLaunchConfigProperties.setClasspath(getClasspath(jbossServer, jbossRuntime, JBossLaunchConfigProperties.getClasspath(launchConfig)), launchConfig);
- JBossLaunchConfigProperties.setUseDefaultClassPath(isUseDefaultClasspath(), launchConfig);
- JBossLaunchConfigProperties.setServerId(getServerId(jbossServer), launchConfig);
- }
-
-
- protected abstract String getEndorsedDir(IJBossServerRuntime runtime);
-
- protected abstract String getServerConfig(IJBossServerRuntime runtime);
-
- protected abstract String getServerHome(IJBossServerRuntime runtime);
-
- private void setServerHome(String serverHome, IJBossServerRuntime runtime,
- ILaunchConfigurationWorkingCopy launchConfig) throws CoreException {
- if (!isCustomConfigLocation(runtime)) {
- JBossLaunchConfigProperties.setServerHome(serverHome, runtime, launchConfig);
- }
- }
-
- protected boolean isCustomConfigLocation(IJBossServerRuntime runtime) {
- return runtime.getConfigLocation().equals(IJBossRuntimeResourceConstants.SERVER);
- }
-
- protected String getClasspathProvider() {
- return DEFAULT_CP_PROVIDER_ID;
- }
-
- protected Map<String, String> getEnvironmentVariables(IJBossServerRuntime runtime) {
- return runtime.getDefaultRunEnvVars();
- }
-
- protected abstract String getDefaultVMArguments(IJBossServerRuntime runtime);
-
-
- protected String getJreContainerPath(IJBossServerRuntime runtime) {
- IVMInstall vmInstall = runtime.getVM();
- if (vmInstall == null) {
- return null;
- }
- return JavaRuntime.newJREContainerPath(vmInstall).toPortableString();
- }
-
- protected abstract String getHost(JBossServer server, IJBossServerRuntime runtime);
-}
\ No newline at end of file
Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/LocalJBossStartLaunchConfigurator.java (from rev 32689, trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/LocalJBossStartupConfigurator.java)
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/LocalJBossStartLaunchConfigurator.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/LocalJBossStartLaunchConfigurator.java 2011-07-08 16:05:56 UTC (rev 32771)
@@ -0,0 +1,111 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.ide.eclipse.as.core.server.internal.launch.configuration;
+
+import java.net.MalformedURLException;
+import java.util.List;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.wst.server.core.IServer;
+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.server.internal.launch.RunJarContainerWrapper;
+import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants;
+import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants;
+import org.jboss.ide.eclipse.as.core.util.LaunchConfigUtils;
+import org.jboss.ide.eclipse.as.core.util.ServerUtil;
+
+public class LocalJBossStartLaunchConfigurator extends AbstractStartLaunchConfigurator {
+
+ public LocalJBossStartLaunchConfigurator(IServer server) throws CoreException {
+ super(server);
+ }
+
+ @Override
+ protected String getMainType() {
+ return IJBossRuntimeConstants.START_MAIN_TYPE;
+ }
+
+ @Override
+ protected String getWorkingDirectory(JBossServer server, IJBossServerRuntime runtime) throws CoreException {
+ return ServerUtil.checkedGetServerHome(server)
+ + Path.SEPARATOR
+ + IJBossRuntimeResourceConstants.BIN;
+ }
+
+ @Override
+ protected List<String> getClasspath(JBossServer server, IJBossServerRuntime runtime, List<String> currentClasspath) throws CoreException {
+ try {
+ boolean replaced = replaceRunJarContainer(server, currentClasspath);
+ if (!replaced) {
+ String runJarEntry = LaunchConfigUtils.getRunJarRuntimeCPEntry(server.getServer()).getMemento();
+ currentClasspath.add(runJarEntry);
+ }
+ return currentClasspath;
+ } catch (CoreException ce) {
+ return currentClasspath;
+ }
+ }
+
+ private boolean replaceRunJarContainer(JBossServer server, List<String> classpath)
+ throws CoreException {
+ boolean replaced = false;
+ for (int i = 0; i < classpath.size(); i++) {
+ String classPathEntry = classpath.get(0);
+ if (classPathEntry.contains(RunJarContainerWrapper.ID)) {
+ replaced = true;
+ classpath.set(i, LaunchConfigUtils.getRunJarRuntimeCPEntry(server.getServer()).getMemento());
+ }
+ }
+ return replaced;
+ }
+
+ @Override
+ protected String getHost(JBossServer server, IJBossServerRuntime runtime) {
+ return server.getServer().getHost();
+ }
+
+ @Override
+ protected String getServerHome(IJBossServerRuntime runtime) {
+ String serverHome = null;
+ try {
+ serverHome = runtime.getConfigLocationFullPath().toFile().toURL().toString();
+ } catch (MalformedURLException murle) {
+ }
+ return serverHome;
+ }
+
+ @Override
+ protected String getServerConfig(IJBossServerRuntime runtime) {
+ return runtime.getJBossConfiguration();
+ }
+
+ @Override
+ protected String getEndorsedDir(IJBossServerRuntime runtime) {
+ return runtime.getRuntime().getLocation().append(
+ IJBossRuntimeResourceConstants.LIB).append(
+ IJBossRuntimeResourceConstants.ENDORSED).toOSString();
+ }
+
+ @Override
+ protected String getDefaultProgramArguments(JBossServer server, IJBossServerRuntime runtime) {
+ return runtime.getDefaultRunArgs() +
+ IJBossRuntimeConstants.SPACE + IJBossRuntimeConstants.STARTUP_ARG_HOST_SHORT +
+ IJBossRuntimeConstants.SPACE + server.getServer().getHost();
+ }
+
+ @Override
+ protected String getDefaultVMArguments(IJBossServerRuntime runtime) {
+ // not needed
+ return null;
+ }
+}
\ No newline at end of file
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/LocalJBossStartLaunchConfigurator.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/LocalJBossStartupConfigurator.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/LocalJBossStartupConfigurator.java 2011-07-08 15:41:23 UTC (rev 32770)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/LocalJBossStartupConfigurator.java 2011-07-08 16:05:56 UTC (rev 32771)
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.ide.eclipse.as.core.server.internal.launch.configuration;
-
-import java.net.MalformedURLException;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.server.core.IServer;
-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.server.internal.launch.RunJarContainerWrapper;
-import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants;
-import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants;
-import org.jboss.ide.eclipse.as.core.util.LaunchConfigUtils;
-import org.jboss.ide.eclipse.as.core.util.ServerUtil;
-
-public class LocalJBossStartupConfigurator extends AbstractStartupConfigurator {
-
- public LocalJBossStartupConfigurator(IServer server) throws CoreException {
- super(server);
- }
-
- @Override
- protected String getMainType() {
- return IJBossRuntimeConstants.START_MAIN_TYPE;
- }
-
- @Override
- protected String getWorkingDirectory(JBossServer server, IJBossServerRuntime runtime) throws CoreException {
- return ServerUtil.checkedGetServerHome(server)
- + Path.SEPARATOR
- + IJBossRuntimeResourceConstants.BIN;
- }
-
- @Override
- protected List<String> getClasspath(JBossServer server, IJBossServerRuntime runtime, List<String> currentClasspath) throws CoreException {
- try {
- boolean replaced = replaceRunJarContainer(server, currentClasspath);
- if (!replaced) {
- String runJarEntry = LaunchConfigUtils.getRunJarRuntimeCPEntry(server.getServer()).getMemento();
- currentClasspath.add(runJarEntry);
- }
- return currentClasspath;
- } catch (CoreException ce) {
- return currentClasspath;
- }
- }
-
- private boolean replaceRunJarContainer(JBossServer server, List<String> classpath)
- throws CoreException {
- boolean replaced = false;
- for (int i = 0; i < classpath.size(); i++) {
- String classPathEntry = classpath.get(0);
- if (classPathEntry.contains(RunJarContainerWrapper.ID)) {
- replaced = true;
- classpath.set(i, LaunchConfigUtils.getRunJarRuntimeCPEntry(server.getServer()).getMemento());
- }
- }
- return replaced;
- }
-
- @Override
- protected String getHost(JBossServer server, IJBossServerRuntime runtime) {
- return server.getServer().getHost();
- }
-
- @Override
- protected String getServerHome(IJBossServerRuntime runtime) {
- String serverHome = null;
- try {
- serverHome = runtime.getConfigLocationFullPath().toFile().toURL().toString();
- } catch (MalformedURLException murle) {
- }
- return serverHome;
- }
-
- @Override
- protected String getServerConfig(IJBossServerRuntime runtime) {
- return runtime.getJBossConfiguration();
- }
-
- @Override
- protected String getEndorsedDir(IJBossServerRuntime runtime) {
- return runtime.getRuntime().getLocation().append(
- IJBossRuntimeResourceConstants.LIB).append(
- IJBossRuntimeResourceConstants.ENDORSED).toOSString();
- }
-
- @Override
- protected String getDefaultProgramArguments(JBossServer server, IJBossServerRuntime runtime) {
- return runtime.getDefaultRunArgs() +
- IJBossRuntimeConstants.SPACE + IJBossRuntimeConstants.STARTUP_ARG_HOST_SHORT +
- IJBossRuntimeConstants.SPACE + server.getServer().getHost();
- }
-
- @Override
- protected String getDefaultVMArguments(IJBossServerRuntime runtime) {
- // not needed
- return null;
- }
-}
\ No newline at end of file
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-07-08 15:41:23 UTC (rev 32770)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-07-08 16:05:56 UTC (rev 32771)
@@ -84,7 +84,7 @@
public void setupLaunchConfiguration(ILaunchConfigurationWorkingCopy launchConfig, IProgressMonitor monitor)
throws CoreException {
// TODO: implement setup for RSE launch delegate too
- new LocalJBoss7StartupConfigurator(getServer()).configure(launchConfig);
+ new LocalJBoss7StartConfigurator(getServer()).configure(launchConfig);
}
public void setProcess(IProcess process) {
Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartConfigurator.java (from rev 32689, trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartupConfigurator.java)
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartConfigurator.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartConfigurator.java 2011-07-08 16:05:56 UTC (rev 32771)
@@ -0,0 +1,88 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.ide.eclipse.as.core.server.internal.v7;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
+import org.eclipse.jdt.launching.IVMInstall;
+import org.eclipse.wst.server.core.IServer;
+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.server.internal.launch.configuration.AbstractStartLaunchConfigurator;
+import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants;
+import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants;
+import org.jboss.ide.eclipse.as.core.util.LaunchConfigUtils;
+
+public class LocalJBoss7StartConfigurator extends AbstractStartLaunchConfigurator {
+
+ public LocalJBoss7StartConfigurator(IServer server) throws CoreException {
+ super(server);
+ }
+
+ @Override
+ protected String getMainType() {
+ return IJBossRuntimeConstants.START7_MAIN_TYPE;
+ }
+
+ @Override
+ protected String getWorkingDirectory(JBossServer server, IJBossServerRuntime runtime) throws CoreException {
+ return runtime.getRuntime().getLocation()
+ .append(IJBossRuntimeResourceConstants.BIN)
+ .toString();
+ }
+
+ @Override
+ protected List<String> getClasspath(JBossServer server, IJBossServerRuntime runtime, List<String> currentClasspath) throws CoreException {
+ IVMInstall vmInstall = runtime.getVM();
+ List<IRuntimeClasspathEntry> classpath = new ArrayList<IRuntimeClasspathEntry>();
+ classpath.add(LaunchConfigUtils.getModulesClasspathEntry(server));
+ LaunchConfigUtils.addJREEntry(vmInstall, classpath);
+ List<String> runtimeClassPaths = LaunchConfigUtils.toStrings(classpath);
+ return runtimeClassPaths;
+ }
+
+ @Override
+ protected String getHost(JBossServer server, IJBossServerRuntime runtime) {
+ // not needed
+ return null;
+ }
+
+ @Override
+ protected String getDefaultProgramArguments(JBossServer server, IJBossServerRuntime runtime) {
+ return runtime.getDefaultRunArgs();
+ }
+
+ @Override
+ protected String getServerHome(IJBossServerRuntime runtime) {
+ // not needed
+ return null;
+ }
+
+ @Override
+ protected String getServerConfig(IJBossServerRuntime runtime) {
+ // not needed
+ return null;
+ }
+
+ @Override
+ protected String getEndorsedDir(IJBossServerRuntime runtime) {
+ // not needed
+ return null;
+ }
+
+ @Override
+ protected String getDefaultVMArguments(IJBossServerRuntime runtime) {
+ return runtime.getDefaultRunVMArgs();
+ }
+}
\ No newline at end of file
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartConfigurator.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartLaunchDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartLaunchDelegate.java 2011-07-08 15:41:23 UTC (rev 32770)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartLaunchDelegate.java 2011-07-08 16:05:56 UTC (rev 32771)
@@ -83,7 +83,7 @@
@Override
public void setupLaunchConfiguration(
ILaunchConfigurationWorkingCopy workingCopy, IServer server) throws CoreException {
- new LocalJBoss7StartupConfigurator(server).configure(workingCopy);
+ new LocalJBoss7StartConfigurator(server).configure(workingCopy);
}
}
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartupConfigurator.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartupConfigurator.java 2011-07-08 15:41:23 UTC (rev 32770)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartupConfigurator.java 2011-07-08 16:05:56 UTC (rev 32771)
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.ide.eclipse.as.core.server.internal.v7;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.wst.server.core.IServer;
-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.server.internal.launch.configuration.AbstractStartupConfigurator;
-import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants;
-import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants;
-import org.jboss.ide.eclipse.as.core.util.LaunchConfigUtils;
-
-public class LocalJBoss7StartupConfigurator extends AbstractStartupConfigurator {
-
- public LocalJBoss7StartupConfigurator(IServer server) throws CoreException {
- super(server);
- }
-
- @Override
- protected String getMainType() {
- return IJBossRuntimeConstants.START7_MAIN_TYPE;
- }
-
- @Override
- protected String getWorkingDirectory(JBossServer server, IJBossServerRuntime runtime) throws CoreException {
- return runtime.getRuntime().getLocation()
- .append(IJBossRuntimeResourceConstants.BIN)
- .toString();
- }
-
- @Override
- protected List<String> getClasspath(JBossServer server, IJBossServerRuntime runtime, List<String> currentClasspath) throws CoreException {
- IVMInstall vmInstall = runtime.getVM();
- List<IRuntimeClasspathEntry> classpath = new ArrayList<IRuntimeClasspathEntry>();
- classpath.add(LaunchConfigUtils.getModulesClasspathEntry(server));
- LaunchConfigUtils.addJREEntry(vmInstall, classpath);
- List<String> runtimeClassPaths = LaunchConfigUtils.toStrings(classpath);
- return runtimeClassPaths;
- }
-
- @Override
- protected String getHost(JBossServer server, IJBossServerRuntime runtime) {
- // not needed
- return null;
- }
-
- @Override
- protected String getDefaultProgramArguments(JBossServer server, IJBossServerRuntime runtime) {
- return runtime.getDefaultRunArgs();
- }
-
- @Override
- protected String getServerHome(IJBossServerRuntime runtime) {
- // not needed
- return null;
- }
-
- @Override
- protected String getServerConfig(IJBossServerRuntime runtime) {
- // not needed
- return null;
- }
-
- @Override
- protected String getEndorsedDir(IJBossServerRuntime runtime) {
- // not needed
- return null;
- }
-
- @Override
- protected String getDefaultVMArguments(IJBossServerRuntime runtime) {
- return runtime.getDefaultRunVMArgs();
- }
-}
\ No newline at end of file
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/launch/LaunchConfigConfiguratorFactory.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/launch/LaunchConfigConfiguratorFactory.java 2011-07-08 15:41:23 UTC (rev 32770)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/launch/LaunchConfigConfiguratorFactory.java 2011-07-08 16:05:56 UTC (rev 32771)
@@ -14,7 +14,7 @@
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
-import org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.LocalJBossStartupConfigurator;
+import org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.LocalJBossStartLaunchConfigurator;
/**
* @author André Dietisheim
@@ -23,7 +23,7 @@
public static ILaunchConfigurationWorkingCopy createCustomConfigLocationLaunchConfig(IServer mockServer) throws CoreException {
MockLaunchConfigWorkingCopy launchConfig = new MockLaunchConfigWorkingCopy();
- LocalJBossStartupConfigurator configurator = new LocalJBossStartupConfigurator(mockServer) {
+ LocalJBossStartLaunchConfigurator configurator = new LocalJBossStartLaunchConfigurator(mockServer) {
@Override
protected boolean isCustomConfigLocation(IJBossServerRuntime runtime) {
return false;
@@ -35,7 +35,7 @@
public static MockLaunchConfigWorkingCopy createNonCustomConfigLocationLaunchConfig(IServer server) throws CoreException {
MockLaunchConfigWorkingCopy launchConfig = new MockLaunchConfigWorkingCopy();
- new LocalJBossStartupConfigurator(server).configure(launchConfig);
+ new LocalJBossStartLaunchConfigurator(server).configure(launchConfig);
return launchConfig;
}
}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/launch/LaunchConfigTests.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/launch/LaunchConfigTests.java 2011-07-08 15:41:23 UTC (rev 32770)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/launch/LaunchConfigTests.java 2011-07-08 16:05:56 UTC (rev 32771)
@@ -21,7 +21,7 @@
import org.eclipse.wst.server.core.IServer;
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.server.internal.launch.configuration.AbstractStartupConfigurator;
+import org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.AbstractStartLaunchConfigurator;
import org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.ILaunchConfigConfigurator;
import org.jboss.ide.eclipse.as.test.util.ServerRuntimeUtils;
@@ -65,7 +65,7 @@
assertEquals("dummyValue", launchConfig.getAttribute(attributeKey, "defaultValue"));
}
- private class MockConfigurator extends AbstractStartupConfigurator {
+ private class MockConfigurator extends AbstractStartLaunchConfigurator {
private MockConfigurator(IServer server) throws CoreException {
super(server);
14 years, 9 months