rename package com.alibaba.oneagent to io.oneagent. alibaba#43

hengyunabc · Mar 31, 2023 · 56d1716 · 56d1716
1 parent c170c57
commit 56d1716
Show file tree

Hide file tree

Showing 145 changed files with 302 additions and 257 deletions.
diff --git a/bytekit-demo-plugin/pom.xml b/bytekit-demo-plugin/pom.xml
@@ -4,7 +4,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>com.alibaba.oneagent</groupId>
+        <groupId>io.oneagent</groupId>
         <artifactId>one-java-agent-parent</artifactId>
         <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>
@@ -13,7 +13,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.alibaba.oneagent</groupId>
+            <groupId>io.oneagent</groupId>
             <artifactId>one-java-agent-plugin</artifactId>
             <version>${project.version}</version>
             <optional>true</optional>

diff --git a/bytekit-demo-plugin/src/main/java/com/activator/test/bytekit/BytekitActivator.java b/bytekit-demo-plugin/src/main/java/com/activator/test/bytekit/BytekitActivator.java
@@ -1,8 +1,9 @@
 package com.activator.test.bytekit;
 
 import com.alibaba.bytekit.ByteKit;
-import com.alibaba.oneagent.plugin.PluginActivator;
-import com.alibaba.oneagent.plugin.PluginContext;
+
+import io.oneagent.plugin.PluginActivator;
+import io.oneagent.plugin.PluginContext;
 
 /**
  * 测试基它插件 import com.alibaba.bytekit 时，使用的是否本插件里的类

diff --git a/demo-agent/pom.xml b/demo-agent/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>com.alibaba.oneagent</groupId>
+        <groupId>io.oneagent</groupId>
         <artifactId>one-java-agent-parent</artifactId>
         <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>

diff --git a/demo-plugin/pom.xml b/demo-plugin/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>com.alibaba.oneagent</groupId>
+        <groupId>io.oneagent</groupId>
         <artifactId>one-java-agent-parent</artifactId>
         <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>
@@ -11,7 +11,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.alibaba.oneagent</groupId>
+            <groupId>io.oneagent</groupId>
             <artifactId>one-java-agent-plugin</artifactId>
             <version>${project.version}</version>
             <optional>true</optional>

diff --git a/demo-plugin/src/main/java/com/activator/test/DemoActivator.java b/demo-plugin/src/main/java/com/activator/test/DemoActivator.java
@@ -5,9 +5,10 @@
 
 import com.alibaba.bytekit.ByteKit;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.oneagent.plugin.PluginActivator;
-import com.alibaba.oneagent.plugin.PluginContext;
-import com.alibaba.oneagent.plugin.config.BinderUtils;
+
+import io.oneagent.plugin.PluginActivator;
+import io.oneagent.plugin.PluginContext;
+import io.oneagent.plugin.config.BinderUtils;
 
 public class DemoActivator implements PluginActivator {
     private Logger logger = LoggerFactory.getLogger(DemoActivator.class);

diff --git a/demo-plugin/src/main/java/com/activator/test/DemoConfig.java b/demo-plugin/src/main/java/com/activator/test/DemoConfig.java
@@ -1,7 +1,7 @@
 package com.activator.test;
 
-import com.alibaba.oneagent.plugin.config.Config;
-import com.alibaba.oneagent.plugin.config.NestedConfig;
+import io.oneagent.plugin.config.Config;
+import io.oneagent.plugin.config.NestedConfig;
 
 @Config
 public class DemoConfig {

diff --git a/dubbo-test-instrument/pom.xml b/dubbo-test-instrument/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>com.alibaba.oneagent</groupId>
+        <groupId>io.oneagent</groupId>
         <artifactId>one-java-agent-parent</artifactId>
         <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>
@@ -26,7 +26,7 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>com.alibaba.oneagent</groupId>
+            <groupId>io.oneagent</groupId>
             <artifactId>dubbo-test-plugin-common</artifactId>
             <version>${project.version}</version>
             <optional>true</optional>

diff --git a/dubbo-test-plugin-common/pom.xml b/dubbo-test-plugin-common/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>com.alibaba.oneagent</groupId>
+        <groupId>io.oneagent</groupId>
         <artifactId>one-java-agent-parent</artifactId>
         <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>
@@ -11,14 +11,14 @@
 
     <dependencies>
          <dependency>
-            <groupId>com.alibaba.oneagent</groupId>
+            <groupId>io.oneagent</groupId>
             <artifactId>one-java-agent-plugin</artifactId>
             <version>${project.version}</version>
             <optional>true</optional>
             <scope>provided</scope>
         </dependency>
          <dependency>
-            <groupId>com.alibaba.oneagent</groupId>
+            <groupId>io.oneagent</groupId>
             <artifactId>one-java-agent</artifactId>
             <version>${project.version}</version>
             <optional>true</optional>

diff --git a/dubbo-test-plugin-common/src/main/java/com/test/dubbo/RpcUtils.java b/dubbo-test-plugin-common/src/main/java/com/test/dubbo/RpcUtils.java
@@ -2,7 +2,7 @@
 
 /**
  * RpcUtils的ClassLoader是
- * {@linkplain com.alibaba.oneagent.plugin.classloader.PluginClassLoader}，演示在被增强的Dubbo代码里加载其它类。
+ * {@linkplain io.oneagent.plugin.classloader.PluginClassLoader}，演示在被增强的Dubbo代码里加载其它类。
  * 
  * @author hengyunabc 2021-08-26
  *

diff --git a/dubbo-test-plugin/pom.xml b/dubbo-test-plugin/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>com.alibaba.oneagent</groupId>
+        <groupId>io.oneagent</groupId>
         <artifactId>one-java-agent-parent</artifactId>
         <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>
@@ -11,30 +11,30 @@
 
     <dependencies>
          <dependency>
-            <groupId>com.alibaba.oneagent</groupId>
+            <groupId>io.oneagent</groupId>
             <artifactId>one-java-agent-plugin</artifactId>
             <version>${project.version}</version>
             <optional>true</optional>
             <scope>provided</scope>
         </dependency>
          <dependency>
-            <groupId>com.alibaba.oneagent</groupId>
+            <groupId>io.oneagent</groupId>
             <artifactId>one-java-agent</artifactId>
             <version>${project.version}</version>
             <optional>true</optional>
             <scope>provided</scope>
         </dependency>
 
          <dependency>
-            <groupId>com.alibaba.oneagent</groupId>
+            <groupId>io.oneagent</groupId>
             <artifactId>dubbo-test-instrument</artifactId>
             <version>${project.version}</version>
             <optional>true</optional>
             <scope>provided</scope>
         </dependency>
 
          <dependency>
-            <groupId>com.alibaba.oneagent</groupId>
+            <groupId>io.oneagent</groupId>
             <artifactId>dubbo-test-plugin-common</artifactId>
             <version>${project.version}</version>
         </dependency>

diff --git a/dubbo-test-plugin/src/main/java/com/test/dubbo/DubboDemoActivator.java b/dubbo-test-plugin/src/main/java/com/test/dubbo/DubboDemoActivator.java
@@ -1,8 +1,8 @@
 package com.test.dubbo;
 
-import com.alibaba.oneagent.plugin.PluginActivator;
-import com.alibaba.oneagent.plugin.PluginContext;
-import com.alibaba.oneagent.service.ClassLoaderHandlerManager;
+import io.oneagent.plugin.PluginActivator;
+import io.oneagent.plugin.PluginContext;
+import io.oneagent.service.ClassLoaderHandlerManager;
 
 /**
  * 

diff --git a/dubbo-test-plugin/src/main/java/com/test/dubbo/DubboPluginClassLoaderHandler.java b/dubbo-test-plugin/src/main/java/com/test/dubbo/DubboPluginClassLoaderHandler.java
@@ -1,6 +1,6 @@
 package com.test.dubbo;
 
-import com.alibaba.oneagent.service.ClassLoaderHandler;
+import io.oneagent.service.ClassLoaderHandler;
 
 /**
  * 

diff --git a/fastjson-demo-plugin/pom.xml b/fastjson-demo-plugin/pom.xml
@@ -4,7 +4,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>com.alibaba.oneagent</groupId>
+        <groupId>io.oneagent</groupId>
         <artifactId>one-java-agent-parent</artifactId>
         <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>
@@ -13,7 +13,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.alibaba.oneagent</groupId>
+            <groupId>io.oneagent</groupId>
             <artifactId>one-java-agent-plugin</artifactId>
             <version>${project.version}</version>
             <optional>true</optional>

diff --git a/fastjson-demo-plugin/src/main/java/com/activator/test/json/FastjsonActivator.java b/fastjson-demo-plugin/src/main/java/com/activator/test/json/FastjsonActivator.java
@@ -1,8 +1,9 @@
 package com.activator.test.json;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.oneagent.plugin.PluginActivator;
-import com.alibaba.oneagent.plugin.PluginContext;
+
+import io.oneagent.plugin.PluginActivator;
+import io.oneagent.plugin.PluginContext;
 
 public class FastjsonActivator implements PluginActivator {
 

diff --git a/grpc-plugin/pom.xml b/grpc-plugin/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>com.alibaba.oneagent</groupId>
+        <groupId>io.oneagent</groupId>
         <artifactId>one-java-agent-parent</artifactId>
         <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>
@@ -11,7 +11,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.alibaba.oneagent</groupId>
+            <groupId>io.oneagent</groupId>
             <artifactId>one-java-agent-plugin</artifactId>
             <version>${project.version}</version>
             <optional>true</optional>

diff --git a/one-agent-service/pom.xml b/one-agent-service/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>com.alibaba.oneagent</groupId>
+        <groupId>io.oneagent</groupId>
         <artifactId>one-java-agent-parent</artifactId>
         <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>

diff --git a/one-agent-service/src/main/proto/OneAgentService.proto b/one-agent-service/src/main/proto/OneAgentService.proto
@@ -7,7 +7,7 @@ import "google/protobuf/any.proto";
 import "google/protobuf/empty.proto";
 
 
-package com.alibaba.oneagent.api;
+package io.oneagent.api;
 
 
 message StringKey {

diff --git a/one-java-agent-plugin/pom.xml b/one-java-agent-plugin/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>com.alibaba.oneagent</groupId>
+        <groupId>io.oneagent</groupId>
         <artifactId>one-java-agent-parent</artifactId>
         <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>

diff --git a/...neagent/env/AbstractPropertyResolver.java → ...neagent/env/AbstractPropertyResolver.java b/...neagent/env/AbstractPropertyResolver.java → ...neagent/env/AbstractPropertyResolver.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.alibaba.oneagent.env;
+package io.oneagent.env;
 
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import com.alibaba.oneagent.env.convert.ConfigurableConversionService;
-import com.alibaba.oneagent.env.convert.DefaultConversionService;
+import io.oneagent.env.convert.ConfigurableConversionService;
+import io.oneagent.env.convert.DefaultConversionService;
 
 /**
  * Abstract base class for resolving properties against any underlying source.

diff --git a/...ent/env/ConfigurablePropertyResolver.java → ...ent/env/ConfigurablePropertyResolver.java b/...ent/env/ConfigurablePropertyResolver.java → ...ent/env/ConfigurablePropertyResolver.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.alibaba.oneagent.env;
+package io.oneagent.env;
 
-import com.alibaba.oneagent.env.convert.ConfigurableConversionService;
+import io.oneagent.env.convert.ConfigurableConversionService;
 
 /**
  * Configuration interface to be implemented by most if not all

diff --git a/...ibaba/oneagent/env/ConversionService.java → ...va/io/oneagent/env/ConversionService.java b/...ibaba/oneagent/env/ConversionService.java → ...va/io/oneagent/env/ConversionService.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.alibaba.oneagent.env;
+package io.oneagent.env;
 
 /**
  * A service interface for type conversion. This is the entry point into the

diff --git a/...neagent/env/EnumerablePropertySource.java → ...neagent/env/EnumerablePropertySource.java b/...neagent/env/EnumerablePropertySource.java → ...neagent/env/EnumerablePropertySource.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.alibaba.oneagent.env;
+package io.oneagent.env;
 
 /**
  * A {@link PropertySource} implementation capable of interrogating its

diff --git a/...com/alibaba/oneagent/env/Environment.java → ...ain/java/io/oneagent/env/Environment.java b/...com/alibaba/oneagent/env/Environment.java → ...ain/java/io/oneagent/env/Environment.java
@@ -1,4 +1,4 @@
-package com.alibaba.oneagent.env;
+package io.oneagent.env;
 
 public interface Environment extends PropertyResolver {
 

diff --git a/...ibaba/oneagent/env/MapPropertySource.java → ...va/io/oneagent/env/MapPropertySource.java b/...ibaba/oneagent/env/MapPropertySource.java → ...va/io/oneagent/env/MapPropertySource.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.alibaba.oneagent.env;
+package io.oneagent.env;
 
 import java.util.Map;
 

diff --git a/...v/MissingRequiredPropertiesException.java → ...v/MissingRequiredPropertiesException.java b/...v/MissingRequiredPropertiesException.java → ...v/MissingRequiredPropertiesException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.alibaba.oneagent.env;
+package io.oneagent.env;
 
 import java.util.LinkedHashSet;
 import java.util.Set;

diff --git a/.../oneagent/env/MutablePropertySources.java → .../oneagent/env/MutablePropertySources.java b/.../oneagent/env/MutablePropertySources.java → .../oneagent/env/MutablePropertySources.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.alibaba.oneagent.env;
+package io.oneagent.env;
 
 import java.util.Iterator;
 import java.util.LinkedList;

diff --git a/...aba/oneagent/env/OneagentEnvironment.java → .../io/oneagent/env/OneagentEnvironment.java b/...aba/oneagent/env/OneagentEnvironment.java → .../io/oneagent/env/OneagentEnvironment.java
@@ -1,4 +1,4 @@
-package com.alibaba.oneagent.env;
+package io.oneagent.env;
 
 import java.security.AccessControlException;
 import java.util.Map;

diff --git a/...neagent/env/PropertiesPropertySource.java → ...neagent/env/PropertiesPropertySource.java b/...neagent/env/PropertiesPropertySource.java → ...neagent/env/PropertiesPropertySource.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.alibaba.oneagent.env;
+package io.oneagent.env;
 
 import java.util.Map;
 import java.util.Properties;

diff --git a/...eagent/env/PropertyPlaceholderHelper.java → ...eagent/env/PropertyPlaceholderHelper.java b/...eagent/env/PropertyPlaceholderHelper.java → ...eagent/env/PropertyPlaceholderHelper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.alibaba.oneagent.env;
+package io.oneagent.env;
 
 import java.util.HashMap;
 import java.util.HashSet;

diff --git a/...libaba/oneagent/env/PropertyResolver.java → ...ava/io/oneagent/env/PropertyResolver.java b/...libaba/oneagent/env/PropertyResolver.java → ...ava/io/oneagent/env/PropertyResolver.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.alibaba.oneagent.env;
+package io.oneagent.env;
 
 /**
  * Interface for resolving properties against any underlying source.

diff --git a/.../alibaba/oneagent/env/PropertySource.java → .../java/io/oneagent/env/PropertySource.java b/.../alibaba/oneagent/env/PropertySource.java → .../java/io/oneagent/env/PropertySource.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.alibaba.oneagent.env;
+package io.oneagent.env;
 
 import java.util.Arrays;