Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

6697: Moving the agent to a top level directory #57

Closed
wants to merge 3 commits into from

Conversation

thegreystone
Copy link
Member

@thegreystone thegreystone commented Feb 21, 2020

See the issue for more information.


Progress

  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jmc pull/57/head:pull/57
$ git checkout pull/57

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Feb 21, 2020

👋 Welcome back hirt! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request.

@@ -1,23 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
Copy link
Collaborator

@jiekang jiekang Feb 21, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you want to add .project and .settings/org.eclipse.jdt.core.prefs back to the vcs in the /agent directory? (minor optional nit)

Copy link
Collaborator

@jiekang jiekang left a comment

Builds of core, agent and jmc worked for me. The agent README instructions also worked for openjdk11

It looks like jcheck does not like empty bodies for the initial PR comment. Maybe we can request it to be patched, or add a body.

@thegreystone thegreystone changed the title 6697: Moving the agent to a top level directory 6697: Moving the agent to a top level directory g Feb 21, 2020
@thegreystone thegreystone changed the title 6697: Moving the agent to a top level directory g 6697: Moving the agent to a top level directory Feb 21, 2020
@openjdk openjdk bot added the rfr label Feb 21, 2020
@mlbridge
Copy link

@mlbridge mlbridge bot commented Feb 21, 2020

Webrevs

Gunde
Gunde approved these changes Feb 24, 2020
Copy link
Collaborator

@Gunde Gunde left a comment

LGTM

@openjdk
Copy link

@openjdk openjdk bot commented Feb 24, 2020

@thegreystone This change now passes all automated pre-integration checks. When the change also fulfills all project specific requirements, type /integrate in a new comment to proceed. After integration, the commit message will be:

6697: Moving the agent to a top level directory

Reviewed-by: jkang, hdafgard
  • If you would like to add a summary, use the /summary command.
  • To credit additional contributors, use the /contributor command.
  • To add additional solved issues, use the /solves command.

Since the source branch of this PR was last updated there has been 1 commit pushed to the master branch. Since there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid automatic rebasing, please merge master into your branch, and then specify the current head hash when integrating, like this: /integrate 9c2076cee7631b1de71173f2febf4b1343ff9085.

➡️ To integrate this PR with the above commit message, type /integrate in a new comment.

@openjdk openjdk bot added the ready label Feb 24, 2020
@thegreystone
Copy link
Member Author

@thegreystone thegreystone commented Feb 24, 2020

/integrate

@openjdk openjdk bot closed this Feb 24, 2020
@openjdk openjdk bot added integrated and removed ready rfr labels Feb 24, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Feb 24, 2020

@thegreystone The following commits have been pushed to master since your change was applied:

  • 9c2076c: 6702: Sanitize more data

Your commit was automatically rebased without conflicts.

Pushed as commit c752ec1.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Feb 24, 2020

Mailing list message from Marcus Hirt on jmc-dev:

Changeset: c752ec1
Author: Marcus Hirt <hirt at openjdk.org>
Date: 2020-02-24 15:49:03 +0000
URL: https://git.openjdk.java.net/jmc/commit/c752ec14

6697: Moving the agent to a top level directory

Reviewed-by: jkang, hdafgard

= agent/.classpath
= agent/.project
= agent/.settings/org.eclipse.jdt.core.prefs
+ agent/README.md
= agent/launchers/InstrumentMe.launch
= agent/launchers/InstrumentMeConverter.launch
= agent/license/LICENSE.txt
= agent/pom.xml
= agent/src/main/java/org/openjdk/jmc/agent/Agent.java
= agent/src/main/java/org/openjdk/jmc/agent/Attribute.java
= agent/src/main/java/org/openjdk/jmc/agent/Field.java
= agent/src/main/java/org/openjdk/jmc/agent/Method.java
= agent/src/main/java/org/openjdk/jmc/agent/Parameter.java
= agent/src/main/java/org/openjdk/jmc/agent/ReturnValue.java
= agent/src/main/java/org/openjdk/jmc/agent/TransformDescriptor.java
= agent/src/main/java/org/openjdk/jmc/agent/TransformRegistry.java
= agent/src/main/java/org/openjdk/jmc/agent/Transformer.java
= agent/src/main/java/org/openjdk/jmc/agent/converters/DefaultStringConverter.java
= agent/src/main/java/org/openjdk/jmc/agent/converters/DoubleConverter.java
= agent/src/main/java/org/openjdk/jmc/agent/converters/FloatConverter.java
= agent/src/main/java/org/openjdk/jmc/agent/converters/IntConverter.java
= agent/src/main/java/org/openjdk/jmc/agent/converters/LongConverter.java
= agent/src/main/java/org/openjdk/jmc/agent/converters/StringConverter.java
= agent/src/main/java/org/openjdk/jmc/agent/converters/package-info.java
= agent/src/main/java/org/openjdk/jmc/agent/impl/DefaultTransformRegistry.java
= agent/src/main/java/org/openjdk/jmc/agent/jfr/JFRTransformDescriptor.java
= agent/src/main/java/org/openjdk/jmc/agent/jfr/VersionResolver.java
= agent/src/main/java/org/openjdk/jmc/agent/jfr/impl/JFRClassVisitor.java
= agent/src/main/java/org/openjdk/jmc/agent/jfr/impl/JFREventClassGenerator.java
= agent/src/main/java/org/openjdk/jmc/agent/jfr/impl/JFREventType.java
= agent/src/main/java/org/openjdk/jmc/agent/jfr/impl/JFRMethodAdvisor.java
= agent/src/main/java/org/openjdk/jmc/agent/jfr/impl/JFRUtils.java
= agent/src/main/java/org/openjdk/jmc/agent/jfrnext/impl/JFRNextClassVisitor.java
= agent/src/main/java/org/openjdk/jmc/agent/jfrnext/impl/JFRNextEventClassGenerator.java
= agent/src/main/java/org/openjdk/jmc/agent/jfrnext/impl/JFRNextMethodAdvisor.java
= agent/src/main/java/org/openjdk/jmc/agent/jmx/AgentController.java
= agent/src/main/java/org/openjdk/jmc/agent/jmx/AgentControllerMBean.java
= agent/src/main/java/org/openjdk/jmc/agent/jmx/AgentManagementFactory.java
= agent/src/main/java/org/openjdk/jmc/agent/util/AccessUtils.java
= agent/src/main/java/org/openjdk/jmc/agent/util/InspectionClassLoader.java
= agent/src/main/java/org/openjdk/jmc/agent/util/TypeUtils.java
= agent/src/main/java/org/openjdk/jmc/agent/util/expression/ExpressionResolver.java
= agent/src/main/java/org/openjdk/jmc/agent/util/expression/IllegalSyntaxException.java
= agent/src/main/java/org/openjdk/jmc/agent/util/expression/ReferenceChain.java
= agent/src/main/java/org/openjdk/jmc/agent/util/expression/ReferenceChainElement.java
= agent/src/test/java/org/openjdk/jmc/agent/converters/test/GurkConverterDouble.java
= agent/src/test/java/org/openjdk/jmc/agent/converters/test/GurkConverterFloat.java
= agent/src/test/java/org/openjdk/jmc/agent/converters/test/GurkConverterInt.java
= agent/src/test/java/org/openjdk/jmc/agent/converters/test/GurkConverterLong.java
= agent/src/test/java/org/openjdk/jmc/agent/converters/test/GurkConverterString.java
= agent/src/test/java/org/openjdk/jmc/agent/converters/test/InstrumentMeConverter.java
= agent/src/test/java/org/openjdk/jmc/agent/converters/test/TestConverterTransforms.java
= agent/src/test/java/org/openjdk/jmc/agent/test/AllTests.java
= agent/src/test/java/org/openjdk/jmc/agent/test/Gurka.java
= agent/src/test/java/org/openjdk/jmc/agent/test/InstrumentMe.java
= agent/src/test/java/org/openjdk/jmc/agent/test/TestDefaultTransformRegistry.java
= agent/src/test/java/org/openjdk/jmc/agent/test/TestDefineEventProbes.java
= agent/src/test/java/org/openjdk/jmc/agent/test/TestJFRTransformer.java
= agent/src/test/java/org/openjdk/jmc/agent/test/TestPermissionChecks.java
= agent/src/test/java/org/openjdk/jmc/agent/test/TestUtils.java
= agent/src/test/java/org/openjdk/jmc/agent/test/util/TestToolkit.java
= agent/src/test/java/org/openjdk/jmc/agent/test/util/TestVisitor.java
= agent/src/test/resources/org/openjdk/jmc/agent/converters/test/jfrprobes_template.xml
= agent/src/test/resources/org/openjdk/jmc/agent/test/failing_control_permission.policy
= agent/src/test/resources/org/openjdk/jmc/agent/test/jfrprobes_template.xml
- core/org.openjdk.jmc.agent/README.md

@thegreystone thegreystone deleted the agentmove branch Mar 12, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants