You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by lk...@apache.org on 2019/05/19 21:08:37 UTC
[netbeans] branch release110-gradle-patch-1 updated (bc64dbd ->
609a703)
This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a change to branch release110-gradle-patch-1
in repository https://gitbox.apache.org/repos/asf/netbeans.git.
from bc64dbd [NETBEANS-2035] Enable Always show Gradle Build output by default.
new 5397f3d [NETBEANS-2527] Update TestSuites in a Gradle Test Run upon completion.
new 44f7ab1 [NETBEANS-2560] Fixing revression that disables all major actions on a Java Project
new 1811de3 [NETBEANS-2288] Fixed Auxialiary properties to use 'netbeans.' prefix as other part of the plugin expects.
new 609a703 Upgraded the patched modules and the readme with building instructions.
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
README.md | 11 +++++
groovy/gradle.java/manifest.mf | 2 +-
.../modules/gradle/java/JavaActionProvider.java | 7 ++-
groovy/gradle.test/manifest.mf | 2 +-
.../gradle/test/GradleTestProgressListener.java | 52 ++++++++++------------
.../modules/gradle/test/GradleTestSuite.java | 45 ++++++++++++++++---
groovy/gradle/manifest.mf | 2 +-
.../gradle/GradleAuxiliaryPropertiesImpl.java | 16 +++++--
8 files changed, 97 insertions(+), 40 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] 04/04: Upgraded the patched modules and the readme with
building instructions.
Posted by lk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a commit to branch release110-gradle-patch-1
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 609a7039f5f3b27dc8951cbd90e9c5754e1b8e2a
Author: Laszlo Kishalmi <la...@gmail.com>
AuthorDate: Sun May 19 14:08:03 2019 -0700
Upgraded the patched modules and the readme with building instructions.
---
README.md | 11 +++++++++++
groovy/gradle.java/manifest.mf | 2 +-
groovy/gradle.test/manifest.mf | 2 +-
groovy/gradle/manifest.mf | 2 +-
4 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index d09de65..dd39ad8 100644
--- a/README.md
+++ b/README.md
@@ -63,6 +63,17 @@ $ ant -Dcluster.config=platform
**Note:** You can also use `php`, `enterprise`, etc. See the [cluster.properties](https://github.com/apache/incubator-netbeans/blob/master/nbbuild/cluster.properties) file.
+#### Building Patch from Sources
+
+Patch source releases does not contain all the code sufficient to build a patch release. In oder to build a patch release, it is required to download the source code of a previous full release. The steps would be the following:
+
+1. Create a directory for the sources: ```mkdir netbeans-patch-src```
+2. Download the full release zip required for the patch.
+3. Download the patch sources zip.
+4. Unzip the release sources into ```netbeans-patch-src```
+5. Unzip the patch sources into ```netbeans-patch-src``` overwrite the existing ones.
+6. Go to the ```netbeans-patch-src``` and follow the build instructions above.
+
#### Building Windows Launchers
Windows launchers can be build using [MinGW](http://www.mingw.org/) both on Windows and Linux.
diff --git a/groovy/gradle.java/manifest.mf b/groovy/gradle.java/manifest.mf
index 4d4d451..42f31be 100644
--- a/groovy/gradle.java/manifest.mf
+++ b/groovy/gradle.java/manifest.mf
@@ -3,4 +3,4 @@ AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.gradle.java
OpenIDE-Module-Layer: org/netbeans/modules/gradle/java/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/gradle/java/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.0.1
+OpenIDE-Module-Specification-Version: 1.0.2
diff --git a/groovy/gradle.test/manifest.mf b/groovy/gradle.test/manifest.mf
index 11d2208..7ff88d6 100644
--- a/groovy/gradle.test/manifest.mf
+++ b/groovy/gradle.test/manifest.mf
@@ -2,4 +2,4 @@ Manifest-Version: 1.0
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.gradle.test
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/gradle/test/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.0.1
+OpenIDE-Module-Specification-Version: 1.0.2
diff --git a/groovy/gradle/manifest.mf b/groovy/gradle/manifest.mf
index fedf0d3..bc77264 100644
--- a/groovy/gradle/manifest.mf
+++ b/groovy/gradle/manifest.mf
@@ -3,5 +3,5 @@ AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.gradle
OpenIDE-Module-Layer: org/netbeans/modules/gradle/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/gradle/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.0.1
+OpenIDE-Module-Specification-Version: 1.0.2
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] 01/04: [NETBEANS-2527] Update TestSuites in a Gradle
Test Run upon completion.
Posted by lk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a commit to branch release110-gradle-patch-1
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 5397f3d9cab27bb4c996cd2c763e7a91c87fd340
Author: Laszlo Kishalmi <la...@gmail.com>
AuthorDate: Sat May 18 09:25:32 2019 -0700
[NETBEANS-2527] Update TestSuites in a Gradle Test Run upon completion.
---
.../gradle/test/GradleTestProgressListener.java | 52 ++++++++++------------
.../modules/gradle/test/GradleTestSuite.java | 45 ++++++++++++++++---
2 files changed, 64 insertions(+), 33 deletions(-)
diff --git a/groovy/gradle.test/src/org/netbeans/modules/gradle/test/GradleTestProgressListener.java b/groovy/gradle.test/src/org/netbeans/modules/gradle/test/GradleTestProgressListener.java
index 383ba7c..ce2f76d 100644
--- a/groovy/gradle.test/src/org/netbeans/modules/gradle/test/GradleTestProgressListener.java
+++ b/groovy/gradle.test/src/org/netbeans/modules/gradle/test/GradleTestProgressListener.java
@@ -23,9 +23,9 @@ import org.netbeans.modules.gradle.api.NbGradleProject;
import java.util.Collection;
import org.netbeans.modules.gradle.spi.GradleProgressListenerProvider;
import java.util.EnumSet;
-import java.util.HashMap;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.gradle.tooling.Failure;
@@ -57,11 +57,12 @@ import org.openide.util.Lookup;
* @author Laszlo Kishalmi
*/
@ProjectServiceProvider(service = GradleProgressListenerProvider.class, projectType = NbGradleProject.GRADLE_PLUGIN_TYPE + "/java")
-public class GradleTestProgressListener implements ProgressListener, GradleProgressListenerProvider {
+public final class GradleTestProgressListener implements ProgressListener, GradleProgressListenerProvider {
final private Project project;
TestSession session;
- Map<String, Testcase> runningTests = new HashMap<>();
+
+ Map<String, Testcase> runningTests = new ConcurrentHashMap<>();
public GradleTestProgressListener(Project project) {
this.project = project;
@@ -125,47 +126,42 @@ public class GradleTestProgressListener implements ProgressListener, GradleProgr
}
private void sessionFinish(TestFinishEvent evt) {
- TestOperationResult result = evt.getResult();
- Report report = session.getReport(result.getEndTime() - result.getStartTime());
+ runningTests.clear();
CoreManager manager = getManager();
if (manager != null) {
manager.sessionFinished(session);
- manager.displayReport(session, report, true);
- manager.sessionFinished(session);
}
}
private void suiteStart(TestStartEvent evt, JvmTestOperationDescriptor op) {
- if (op.getClassName() != null) {
- TestSuite suite = new GradleTestSuite(op);
- session.addSuite(suite);
+ }
+
+ private void suiteFinish(TestFinishEvent evt, JvmTestOperationDescriptor op) {
+ TestOperationResult result = evt.getResult();
+ TestSuite currentSuite = session.getCurrentSuite();
+ String suiteName = GradleTestSuite.suiteName(op);
+ if (suiteName.equals(currentSuite.getName())) {
+ Report report = session.getReport(result.getEndTime() - result.getStartTime());
CoreManager manager = getManager();
if (manager != null) {
- manager.displaySuiteRunning(session, suite);
+ manager.displayReport(session, report, true);
}
}
}
- private void suiteFinish(TestFinishEvent evt, JvmTestOperationDescriptor op) {
-
- }
-
private void caseStart(TestStartEvent evt, JvmTestOperationDescriptor op) {
- Testcase tc = new GradleTestcase(op, session);
- if (op.getSuiteName() == null) {
- // Sometimes it is possible to receive testcase execution events
- // without suite. It is common with TestNG
- TestSuite currentSuite = session.getCurrentSuite();
- if ((currentSuite == null) || !currentSuite.getName().equals(op.getClassName())) {
- TestSuite suite = new GradleTestSuite(op);
- session.addSuite(suite);
- CoreManager manager = getManager();
- if (manager != null) {
- manager.displaySuiteRunning(session, suite);
- }
+ assert session != null;
+ assert op.getParent() != null;
+ TestSuite currentSuite = session.getCurrentSuite();
+ TestSuite newSuite = new GradleTestSuite((JvmTestOperationDescriptor) op.getParent());
+ if ((currentSuite == null) || !currentSuite.equals(newSuite)) {
+ session.addSuite(newSuite);
+ CoreManager manager = getManager();
+ if (manager != null) {
+ manager.displaySuiteRunning(session, newSuite);
}
}
- tc.setClassName(op.getClassName());
+ Testcase tc = new GradleTestcase(op, session);
runningTests.put(getTestOpKey(op), tc);
session.addTestCase(tc);
}
diff --git a/groovy/gradle.test/src/org/netbeans/modules/gradle/test/GradleTestSuite.java b/groovy/gradle.test/src/org/netbeans/modules/gradle/test/GradleTestSuite.java
index 68e0144..4834d35 100644
--- a/groovy/gradle.test/src/org/netbeans/modules/gradle/test/GradleTestSuite.java
+++ b/groovy/gradle.test/src/org/netbeans/modules/gradle/test/GradleTestSuite.java
@@ -19,6 +19,8 @@
package org.netbeans.modules.gradle.test;
+import java.util.Objects;
+import org.gradle.tooling.events.OperationDescriptor;
import org.gradle.tooling.events.test.JvmTestOperationDescriptor;
import org.netbeans.modules.gsf.testrunner.api.TestSuite;
@@ -26,17 +28,50 @@ import org.netbeans.modules.gsf.testrunner.api.TestSuite;
*
* @author Laszlo Kishalmi
*/
-public class GradleTestSuite extends TestSuite {
-
+public final class GradleTestSuite extends TestSuite {
+
private final JvmTestOperationDescriptor operation;
-
+
public GradleTestSuite(JvmTestOperationDescriptor op) {
- super(op.getClassName());
+ super(suiteName(op));
this.operation = op;
}
public JvmTestOperationDescriptor getOperation() {
return operation;
}
-
+
+ @Override
+ public int hashCode() {
+ int hash = 3;
+ hash = 29 * hash + Objects.hashCode(this.operation);
+ return hash;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ final GradleTestSuite other = (GradleTestSuite) obj;
+ return Objects.equals(this.getName(), other.getName());
+ }
+
+ static String suiteName(OperationDescriptor op) {
+ assert op != null;
+
+ if (op instanceof JvmTestOperationDescriptor) {
+ JvmTestOperationDescriptor desc = (JvmTestOperationDescriptor)op;
+ return desc.getSuiteName() != null ? desc.getSuiteName() : desc.getClassName();
+ } else {
+ return op.getDisplayName() != null ? op.getDisplayName() : op.getName();
+ }
+ }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] 02/04: [NETBEANS-2560] Fixing revression that disables
all major actions on a Java Project
Posted by lk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a commit to branch release110-gradle-patch-1
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 44f7ab1cf00e4e725a13a7d51fc6687469a1cf1b
Author: Laszlo Kishalmi <la...@gmail.com>
AuthorDate: Sun May 19 06:14:02 2019 -0700
[NETBEANS-2560] Fixing revression that disables all major actions on a Java Project
---
.../src/org/netbeans/modules/gradle/java/JavaActionProvider.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/JavaActionProvider.java b/groovy/gradle.java/src/org/netbeans/modules/gradle/java/JavaActionProvider.java
index 4aab8cb..7c680e5 100644
--- a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/JavaActionProvider.java
+++ b/groovy/gradle.java/src/org/netbeans/modules/gradle/java/JavaActionProvider.java
@@ -27,6 +27,9 @@ import org.netbeans.modules.gradle.spi.actions.DefaultGradleActionsProvider;
import org.netbeans.modules.gradle.spi.actions.GradleActionsProvider;
import static org.netbeans.modules.gradle.java.api.GradleJavaSourceSet.SourceType.*;
import java.io.File;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
import static org.netbeans.spi.project.ActionProvider.*;
import static org.netbeans.api.java.project.JavaProjectConstants.*;
import org.netbeans.api.java.source.ClasspathInfo;
@@ -82,9 +85,9 @@ public class JavaActionProvider extends DefaultGradleActionsProvider {
if (gbp.hasPlugins(GATLING_PLUGIN) && COMMAND_RUN_SINGLE.equals(action)) {
ret = fo.getNameExt().endsWith(SIMULATION_POSTFIX);
} else {
- ret = false;
GradleJavaProject gjp = GradleJavaProject.get(project);
if ( gjp != null ) {
+ ret = false;
switch (action) {
case COMMAND_COMPILE_SINGLE:
FileBuiltQuery.Status status = FileBuiltQuery.getStatus(fo);
@@ -119,6 +122,8 @@ public class JavaActionProvider extends DefaultGradleActionsProvider {
ret = sourceSet != null && sourceSet.getSourceType(dir) != RESOURCES;
}
break;
+ default:
+ ret = true;
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] 03/04: [NETBEANS-2288] Fixed Auxialiary properties to
use 'netbeans.' prefix as other part of the plugin expects.
Posted by lk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a commit to branch release110-gradle-patch-1
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 1811de3d3370642cdab44e7f371f88387d4ab7f5
Author: Laszlo Kishalmi <la...@gmail.com>
AuthorDate: Sun May 19 07:13:41 2019 -0700
[NETBEANS-2288] Fixed Auxialiary properties to use 'netbeans.' prefix as other part of the plugin expects.
---
.../modules/gradle/GradleAuxiliaryPropertiesImpl.java | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/GradleAuxiliaryPropertiesImpl.java b/groovy/gradle/src/org/netbeans/modules/gradle/GradleAuxiliaryPropertiesImpl.java
index aa70c21..8aa974e 100644
--- a/groovy/gradle/src/org/netbeans/modules/gradle/GradleAuxiliaryPropertiesImpl.java
+++ b/groovy/gradle/src/org/netbeans/modules/gradle/GradleAuxiliaryPropertiesImpl.java
@@ -26,8 +26,10 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
+import java.util.Set;
import org.netbeans.api.project.ProjectManager;
import org.netbeans.spi.project.AuxiliaryProperties;
import org.openide.util.EditableProperties;
@@ -39,7 +41,10 @@ import org.openide.util.Mutex.Action;
*/
public class GradleAuxiliaryPropertiesImpl implements AuxiliaryProperties {
- private static final String PROP_PREFIX = "nb-config."; //NOI18N
+ private static final String WRONG_PREFIX = "nb-config."; //NOI18N
+ // USE THIS PREFIX [NETBEANS-2288], AS IT CAN BE OVERWRITTEN IN
+ // GRADLE PROPERTY FILES
+ private static final String PROP_PREFIX = "netbeans."; //NOI18N
final NbGradleProjectImpl project;
@@ -52,7 +57,8 @@ public class GradleAuxiliaryPropertiesImpl implements AuxiliaryProperties {
return ProjectManager.mutex().readAccess(new Action<String>() {
@Override
public String run() {
- return getProperties(shared).get(PROP_PREFIX + key);
+ EditableProperties props = getProperties(shared);
+ return props.getOrDefault(PROP_PREFIX + key, props.get(WRONG_PREFIX + key));
}
});
}
@@ -65,6 +71,7 @@ public class GradleAuxiliaryPropertiesImpl implements AuxiliaryProperties {
props.put(PROP_PREFIX + key, value);
} else {
props.remove(PROP_PREFIX + key);
+ props.remove(WRONG_PREFIX + key);
}
putProperties(props, shared);
@@ -73,12 +80,15 @@ public class GradleAuxiliaryPropertiesImpl implements AuxiliaryProperties {
@Override
public Iterable<String> listKeys(boolean shared) {
- List<String> ret = new LinkedList<>();
+ Set<String> ret = new HashSet<>();
EditableProperties props = getProperties(shared);
for (String key : props.keySet()) {
if (key.startsWith(PROP_PREFIX)) {
ret.add(key.substring(PROP_PREFIX.length()));
}
+ if (key.startsWith(WRONG_PREFIX)) {
+ ret.add(key.substring(WRONG_PREFIX.length()));
+ }
}
return ret;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists