diff --git a/monitor/src/main/java/com/zfoo/monitor/model/DiskFileSystem.java b/monitor/src/main/java/com/zfoo/monitor/DiskFileSystem.java similarity index 98% rename from monitor/src/main/java/com/zfoo/monitor/model/DiskFileSystem.java rename to monitor/src/main/java/com/zfoo/monitor/DiskFileSystem.java index 53ca2cdf..393f5750 100644 --- a/monitor/src/main/java/com/zfoo/monitor/model/DiskFileSystem.java +++ b/monitor/src/main/java/com/zfoo/monitor/DiskFileSystem.java @@ -1,6 +1,5 @@ /* * Copyright (C) 2020 The zfoo Authors - * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at * @@ -11,7 +10,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.monitor.model; +package com.zfoo.monitor; import com.zfoo.monitor.util.OSUtils; import com.zfoo.protocol.util.IOUtils; diff --git a/monitor/src/main/java/com/zfoo/monitor/model/DiskStorage.java b/monitor/src/main/java/com/zfoo/monitor/DiskStorage.java similarity index 97% rename from monitor/src/main/java/com/zfoo/monitor/model/DiskStorage.java rename to monitor/src/main/java/com/zfoo/monitor/DiskStorage.java index a123a3ec..ef077840 100644 --- a/monitor/src/main/java/com/zfoo/monitor/model/DiskStorage.java +++ b/monitor/src/main/java/com/zfoo/monitor/DiskStorage.java @@ -1,6 +1,5 @@ /* * Copyright (C) 2020 The zfoo Authors - * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at * @@ -11,7 +10,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.monitor.model; +package com.zfoo.monitor; /** * @author godotg diff --git a/monitor/src/main/java/com/zfoo/monitor/model/JvmMemory.java b/monitor/src/main/java/com/zfoo/monitor/JvmMemory.java similarity index 68% rename from monitor/src/main/java/com/zfoo/monitor/model/JvmMemory.java rename to monitor/src/main/java/com/zfoo/monitor/JvmMemory.java index 12fa4652..bdab42a0 100644 --- a/monitor/src/main/java/com/zfoo/monitor/model/JvmMemory.java +++ b/monitor/src/main/java/com/zfoo/monitor/JvmMemory.java @@ -1,4 +1,16 @@ -package com.zfoo.monitor.model; +/* + * Copyright (C) 2020 The zfoo Authors + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and limitations under the License. + */ + +package com.zfoo.monitor; import com.zfoo.protocol.util.IOUtils; diff --git a/monitor/src/main/java/com/zfoo/monitor/model/Memory.java b/monitor/src/main/java/com/zfoo/monitor/Memory.java similarity index 98% rename from monitor/src/main/java/com/zfoo/monitor/model/Memory.java rename to monitor/src/main/java/com/zfoo/monitor/Memory.java index def97e96..0744f7e7 100644 --- a/monitor/src/main/java/com/zfoo/monitor/model/Memory.java +++ b/monitor/src/main/java/com/zfoo/monitor/Memory.java @@ -1,6 +1,5 @@ /* * Copyright (C) 2020 The zfoo Authors - * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at * @@ -11,7 +10,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.monitor.model; +package com.zfoo.monitor; import com.zfoo.monitor.util.OSUtils; import com.zfoo.protocol.util.IOUtils; diff --git a/monitor/src/main/java/com/zfoo/monitor/model/Monitor.java b/monitor/src/main/java/com/zfoo/monitor/Monitor.java similarity index 99% rename from monitor/src/main/java/com/zfoo/monitor/model/Monitor.java rename to monitor/src/main/java/com/zfoo/monitor/Monitor.java index fd46af82..008e499a 100644 --- a/monitor/src/main/java/com/zfoo/monitor/model/Monitor.java +++ b/monitor/src/main/java/com/zfoo/monitor/Monitor.java @@ -1,6 +1,5 @@ /* * Copyright (C) 2020 The zfoo Authors - * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at * @@ -11,7 +10,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.monitor.model; +package com.zfoo.monitor; import com.zfoo.monitor.util.OSUtils; import com.zfoo.protocol.collection.CollectionUtils; diff --git a/monitor/src/main/java/com/zfoo/monitor/model/Sar.java b/monitor/src/main/java/com/zfoo/monitor/Sar.java similarity index 99% rename from monitor/src/main/java/com/zfoo/monitor/model/Sar.java rename to monitor/src/main/java/com/zfoo/monitor/Sar.java index 4e91eba7..8dd174a1 100644 --- a/monitor/src/main/java/com/zfoo/monitor/model/Sar.java +++ b/monitor/src/main/java/com/zfoo/monitor/Sar.java @@ -1,6 +1,5 @@ /* * Copyright (C) 2020 The zfoo Authors - * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at * @@ -11,7 +10,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.monitor.model; +package com.zfoo.monitor; import com.zfoo.protocol.util.StringUtils; import com.zfoo.scheduler.util.TimeUtils; diff --git a/monitor/src/main/java/com/zfoo/monitor/model/SystemInfo.java b/monitor/src/main/java/com/zfoo/monitor/SystemInfo.java similarity index 72% rename from monitor/src/main/java/com/zfoo/monitor/model/SystemInfo.java rename to monitor/src/main/java/com/zfoo/monitor/SystemInfo.java index d095233b..4ec8c768 100644 --- a/monitor/src/main/java/com/zfoo/monitor/model/SystemInfo.java +++ b/monitor/src/main/java/com/zfoo/monitor/SystemInfo.java @@ -1,4 +1,16 @@ -package com.zfoo.monitor.model; +/* + * Copyright (C) 2020 The zfoo Authors + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and limitations under the License. + */ + +package com.zfoo.monitor; public class SystemInfo { diff --git a/monitor/src/main/java/com/zfoo/monitor/model/Uptime.java b/monitor/src/main/java/com/zfoo/monitor/Uptime.java similarity index 98% rename from monitor/src/main/java/com/zfoo/monitor/model/Uptime.java rename to monitor/src/main/java/com/zfoo/monitor/Uptime.java index 3151bee8..bc48d0df 100644 --- a/monitor/src/main/java/com/zfoo/monitor/model/Uptime.java +++ b/monitor/src/main/java/com/zfoo/monitor/Uptime.java @@ -1,6 +1,5 @@ /* * Copyright (C) 2020 The zfoo Authors - * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at * @@ -11,7 +10,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.monitor.model; +package com.zfoo.monitor; import com.zfoo.monitor.util.OSUtils; import com.zfoo.protocol.util.StringUtils; diff --git a/monitor/src/main/java/com/zfoo/monitor/util/JvmUtils.java b/monitor/src/main/java/com/zfoo/monitor/util/JvmUtils.java index bcb5a83a..5ebbe1ec 100644 --- a/monitor/src/main/java/com/zfoo/monitor/util/JvmUtils.java +++ b/monitor/src/main/java/com/zfoo/monitor/util/JvmUtils.java @@ -1,6 +1,6 @@ package com.zfoo.monitor.util; -import com.zfoo.monitor.model.JvmMemory; +import com.zfoo.monitor.JvmMemory; import java.lang.management.*; import java.util.ArrayList; diff --git a/monitor/src/main/java/com/zfoo/monitor/util/OSUtils.java b/monitor/src/main/java/com/zfoo/monitor/util/OSUtils.java index b864f298..3c9f05f0 100644 --- a/monitor/src/main/java/com/zfoo/monitor/util/OSUtils.java +++ b/monitor/src/main/java/com/zfoo/monitor/util/OSUtils.java @@ -13,7 +13,7 @@ package com.zfoo.monitor.util; -import com.zfoo.monitor.model.*; +import com.zfoo.monitor.*; import com.zfoo.protocol.util.IOUtils; import com.zfoo.protocol.util.StringUtils; import com.zfoo.scheduler.util.TimeUtils;