[156737] Fix versioning issues
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/.classpath b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/.classpath
index 751c8f2..c8e5756 100644
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/.classpath
+++ b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/.classpath
@@ -2,6 +2,11 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
+ <accessrules>
+ <accessrule kind="accessible" pattern="org/eclipse/wst/**"/>
+ <accessrule kind="accessible" pattern="org/eclipse/jst/**"/>
+ </accessrules>
+ </classpathentry>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletEjbAntProjectBuilder.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletEjbAntProjectBuilder.java
index 9b0fd48..ea3aea9 100644
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletEjbAntProjectBuilder.java
+++ b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletEjbAntProjectBuilder.java
@@ -20,6 +20,7 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtension;
import org.eclipse.core.runtime.IPath;
@@ -82,7 +83,7 @@
if (elements == null)
continue;
try {
- String pluginDescriptor = elements[0].getDeclaringExtension().getNamespace();
+ String pluginDescriptor = elements[0].getDeclaringExtension().getContributor().getName();
org.osgi.framework.Bundle bundle = Platform.getBundle(pluginDescriptor);
Class c = bundle.loadClass(elements[0].getAttribute("class"));
@@ -137,7 +138,7 @@
properties.put("xdoclet.home", getPreferenceStore().getProperty(XDocletPreferenceStore.XDOCLETHOME)); //$NON-NLS-1$
URL url = Platform.getBundle("org.apache.ant").getEntry("/"); //$NON-NLS-1$ //$NON-NLS-2$
- url = Platform.asLocalURL(url);
+ url = FileLocator.toFileURL(url);
File file = new File(url.getFile());
properties.put("ant.home", file.getAbsolutePath()); //$NON-NLS-1$
WorkbenchComponent ejbModule = core.getComponent();
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletWebAntProjectBuilder.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletWebAntProjectBuilder.java
index e31a69c..ad0bebc 100644
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletWebAntProjectBuilder.java
+++ b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletWebAntProjectBuilder.java
@@ -19,6 +19,7 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtension;
import org.eclipse.core.runtime.IPath;
@@ -69,7 +70,7 @@
if (elements == null)
continue;
try {
- String pluginDescriptor = elements[0].getDeclaringExtension().getNamespace();
+ String pluginDescriptor = elements[0].getDeclaringExtension().getContributor().getName();
org.osgi.framework.Bundle bundle = Platform.getBundle(pluginDescriptor);
Class c = bundle.loadClass(elements[0].getAttribute("class"));
@@ -101,18 +102,18 @@
WebArtifactEdit webEdit = null;
try {
moduleCore = StructureEdit.getStructureEditForRead(javaProject.getProject());
-
+
WorkbenchComponent wbModule = moduleCore.getComponent();
IProject proj = javaProject.getProject();
webEdit = WebArtifactEdit.getWebArtifactEditForRead(proj);
if (webEdit != null) {
- if((contextRoot = webEdit.getServerContextRoot()) == null)
+ if ((contextRoot = webEdit.getServerContextRoot()) == null)
contextRoot = "";//$NON-NLS-1$
}
String projectDir = resource.getProject().getLocation().toString();
- IPath webInf = getWebInfFolder(wbModule);
- properties.put("web.module.webinf", projectDir +"/"+webInf.toString()); //$NON-NLS-1$
+ IPath webInf = getWebInfFolder(wbModule);
+ properties.put("web.module.webinf", projectDir + "/" + webInf.toString()); //$NON-NLS-1$
properties.put("web", contextRoot); //$NON-NLS-1$
properties.put("web.project.dir", projectDir); //$NON-NLS-1$
properties.put("web.project.classpath", asClassPath(javaProject)); //$NON-NLS-1$
@@ -120,10 +121,11 @@
properties.put("web.module.gen", packageFragmentRoot.getResource().getLocation().toString()); //$NON-NLS-1$
properties.put("web.bin.dir", this.getJavaProjectOutputContainer(javaProject).toString()); //$NON-NLS-1$
properties.put("xdoclet.home", getPreferenceStore().getProperty(XDocletPreferenceStore.XDOCLETHOME)); //$NON-NLS-1$
- properties.put("xdoclet.merge.dir", projectDir +"/"+webInf.toString());
- //getPreferenceStore().getProperty(projectDir +"/"+XDocletPreferenceStore.XDOCLEMERGEDIR)); //$NON-NLS-1$
+ properties.put("xdoclet.merge.dir", projectDir + "/" + webInf.toString());
+ // getPreferenceStore().getProperty(projectDir
+ // +"/"+XDocletPreferenceStore.XDOCLEMERGEDIR)); //$NON-NLS-1$
URL url = Platform.getBundle("org.apache.ant").getEntry("/"); //$NON-NLS-1$ //$NON-NLS-2$
- url = Platform.asLocalURL(url);
+ url = FileLocator.toFileURL(url);
File file = new File(url.getFile());
properties.put("ant.home", file.getAbsolutePath()); //$NON-NLS-1$
@@ -198,7 +200,7 @@
ComponentResource[] webXML = webModule.findResourcesByRuntimePath(new Path("/WEB-INF"));
for (int i = 0; i < webXML.length; i++) {
ComponentResource resource = webXML[i];
- if(resource.getRuntimePath().toString().equals("/WEB-INF"))
+ if (resource.getRuntimePath().toString().equals("/WEB-INF"))
return resource.getSourcePath();
}
if (webXML.length > 0)
