You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by jt...@apache.org on 2017/10/09 12:35:57 UTC
[3/4] incubator-netbeans git commit: Spring Beans do no need
dependency on J2EE core
Spring Beans do no need dependency on J2EE core
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/03d63409
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/03d63409
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/03d63409
Branch: refs/heads/master
Commit: 03d63409524fcdb15a985ddddb4cf7e0c368ff2c
Parents: c29c3b9
Author: Jaroslav Tulach <ja...@oracle.com>
Authored: Mon Oct 9 13:05:38 2017 +0200
Committer: Jaroslav Tulach <ja...@oracle.com>
Committed: Mon Oct 9 13:05:38 2017 +0200
----------------------------------------------------------------------
spring.beans/nbproject/project.xml | 13 ----
.../beans/model/CommonAnnotationTestCase.java | 76 --------------------
2 files changed, 89 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/03d63409/spring.beans/nbproject/project.xml
----------------------------------------------------------------------
diff --git a/spring.beans/nbproject/project.xml b/spring.beans/nbproject/project.xml
index 52fd509..dd67381 100644
--- a/spring.beans/nbproject/project.xml
+++ b/spring.beans/nbproject/project.xml
@@ -500,10 +500,6 @@
<test-type>
<name>unit</name>
<test-dependency>
- <code-name-base>org.netbeans.api.web.webmodule</code-name-base>
- <compile-dependency/>
- </test-dependency>
- <test-dependency>
<code-name-base>org.netbeans.libs.junit4</code-name-base>
<compile-dependency/>
</test-dependency>
@@ -520,15 +516,6 @@
<code-name-base>org.netbeans.modules.editor.mimelookup.impl</code-name-base>
</test-dependency>
<test-dependency>
- <code-name-base>org.netbeans.modules.j2ee.core</code-name-base>
- <compile-dependency/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.j2ee.dd</code-name-base>
- <recursive/>
- <compile-dependency/>
- </test-dependency>
- <test-dependency>
<code-name-base>org.netbeans.modules.j2ee.metadata.model.support</code-name-base>
<compile-dependency/>
<test/>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/03d63409/spring.beans/test/unit/src/org/netbeans/modules/spring/api/beans/model/CommonAnnotationTestCase.java
----------------------------------------------------------------------
diff --git a/spring.beans/test/unit/src/org/netbeans/modules/spring/api/beans/model/CommonAnnotationTestCase.java b/spring.beans/test/unit/src/org/netbeans/modules/spring/api/beans/model/CommonAnnotationTestCase.java
index e0cc616..d260198 100644
--- a/spring.beans/test/unit/src/org/netbeans/modules/spring/api/beans/model/CommonAnnotationTestCase.java
+++ b/spring.beans/test/unit/src/org/netbeans/modules/spring/api/beans/model/CommonAnnotationTestCase.java
@@ -29,24 +29,17 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
-import org.netbeans.api.j2ee.core.Profile;
import org.netbeans.api.java.classpath.ClassPath;
import org.netbeans.api.project.Project;
import org.netbeans.api.project.ui.ProjectGroup;
import org.netbeans.api.project.ui.ProjectGroupChangeListener;
import org.netbeans.junit.MockServices;
-import org.netbeans.modules.j2ee.dd.api.web.WebAppMetadata;
import org.netbeans.modules.j2ee.metadata.model.api.MetadataModel;
import org.netbeans.modules.j2ee.metadata.model.api.MetadataModelAction;
import org.netbeans.modules.j2ee.metadata.model.support.JavaSourceTestCase;
import org.netbeans.modules.parsing.api.indexing.IndexingManager;
-import org.netbeans.modules.project.ui.OpenProjectList;
import org.netbeans.modules.project.uiapi.OpenProjectsTrampoline;
-import org.netbeans.modules.web.api.webmodule.WebModule;
-import org.netbeans.modules.web.spi.webmodule.WebModuleFactory;
-import org.netbeans.modules.web.spi.webmodule.WebModuleImplementation2;
-import org.netbeans.modules.web.spi.webmodule.WebModuleProvider;
import org.netbeans.spi.java.classpath.support.ClassPathSupport;
import org.openide.filesystems.FileObject;
import org.openide.util.test.MockLookup;
@@ -57,8 +50,6 @@ import org.openide.util.test.MockLookup;
*/
public class CommonAnnotationTestCase extends JavaSourceTestCase {
- WebModuleProvider webModuleProvider;
-
public CommonAnnotationTestCase(String testName) {
super(testName);
}
@@ -66,9 +57,7 @@ public class CommonAnnotationTestCase extends JavaSourceTestCase {
@Override
protected void setUp() throws Exception {
super.setUp();
- webModuleProvider = new FakeWebModuleProvider(srcFO);
MockLookup.setInstances(
- webModuleProvider,
new ClassPathProviderImpl(),
new OpenProject());
MockServices.setServices(
@@ -118,71 +107,6 @@ public class CommonAnnotationTestCase extends JavaSourceTestCase {
//<editor-fold defaultstate="collapsed">
- protected static class FakeWebModuleProvider implements WebModuleProvider {
-
- private FileObject webRoot;
-
- public FakeWebModuleProvider(FileObject webRoot) {
- this.webRoot = webRoot;
- }
-
- @Override
- public WebModule findWebModule(FileObject file) {
- return WebModuleFactory.createWebModule(new FakeWebModuleImplementation2(webRoot));
- }
- }
-
- private static class FakeWebModuleImplementation2 implements WebModuleImplementation2 {
-
- private FileObject webRoot;
-
- public FakeWebModuleImplementation2(FileObject webRoot) {
- this.webRoot = webRoot;
- }
-
- @Override
- public FileObject getDocumentBase() {
- return webRoot;
- }
-
- @Override
- public String getContextPath() {
- return "/";
- }
-
- @Override
- public Profile getJ2eeProfile() {
- return Profile.JAVA_EE_6_FULL;
- }
-
- @Override
- public FileObject getWebInf() {
- return null;
- }
-
- @Override
- public FileObject getDeploymentDescriptor() {
- return null;
- }
-
- @Override
- public FileObject[] getJavaSources() {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public MetadataModel<WebAppMetadata> getMetadataModel() {
- return null;
- }
-
- @Override
- public void addPropertyChangeListener(PropertyChangeListener listener) {
- }
-
- @Override
- public void removePropertyChangeListener(PropertyChangeListener listener) {
- }
- }
public static class OpenProject implements OpenProjectsTrampoline {