This is an automated email from the ASF dual-hosted git repository.
cgarcia pushed a commit to branch feature/merlot
in repository https://gitbox.apache.org/repos/asf/plc4x-extras.git
The following commit(s) were added to refs/heads/feature/merlot by this push:
new 779f887 Missing license headers in files were corrected.
779f887 is described below
commit 779f887d5d2f0fa5cc9a140493af0be3fe177e72
Author: César García <[email protected]>
AuthorDate: Mon Mar 16 16:16:34 2026 -0400
Missing license headers in files were corrected.
---
.../java/org/apache/plc4x/merlot/api/PlcModel.java | 18 +++
.../src/main/resources/proto/EPICSEvent.proto | 155 ++++++++++++++++-----
.../src/main/resources/proto/das.proto | 18 +++
.../src/main/resources/proto/helloworld.proto | 18 +++
.../src/main/resources/proto/modbus.proto | 18 +++
.../src/main/resources/proto/ping.proto | 18 +++
.../apache/plc4x/merlot/api/ByteBufJUnitTest.java | 18 ++-
.../merlot/api/SampleGuidelinesProofTest.java | 18 +++
.../src/docs/asciidoc/S7PlcModel.puml | 18 +++
.../src/docs/asciidoc/s7notes.adoc | 20 +++
10 files changed, 285 insertions(+), 34 deletions(-)
diff --git
a/plc4j/tools/merlot/org.apache.plc4x.merlot.das.api/src/main/java/org/apache/plc4x/merlot/api/PlcModel.java
b/plc4j/tools/merlot/org.apache.plc4x.merlot.das.api/src/main/java/org/apache/plc4x/merlot/api/PlcModel.java
index 0405859..a4f79a8 100644
---
a/plc4j/tools/merlot/org.apache.plc4x.merlot.das.api/src/main/java/org/apache/plc4x/merlot/api/PlcModel.java
+++
b/plc4j/tools/merlot/org.apache.plc4x.merlot.das.api/src/main/java/org/apache/plc4x/merlot/api/PlcModel.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * https://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 org.apache.plc4x.merlot.api;
import java.util.List;
diff --git
a/plc4j/tools/merlot/org.apache.plc4x.merlot.das.api/src/main/resources/proto/EPICSEvent.proto
b/plc4j/tools/merlot/org.apache.plc4x.merlot.das.api/src/main/resources/proto/EPICSEvent.proto
index 4379109..4de51f2 100644
---
a/plc4j/tools/merlot/org.apache.plc4x.merlot.das.api/src/main/resources/proto/EPICSEvent.proto
+++
b/plc4j/tools/merlot/org.apache.plc4x.merlot.das.api/src/main/resources/proto/EPICSEvent.proto
@@ -1,11 +1,98 @@
+/*
+The "Software", below, refers to EPICS archiver appliance (in either
+source code, or binary form and accompanying documentation). Each
+licensee is addressed as "you" or "Licensee."
+
+The copyright holders shown above and their third-party licensors hereby
+grant Licensee a royalty-free nonexclusive license, subject to the
+limitations stated herein and U.S. Government license rights.
+
+You may modify and make a copy or copies of the Software for use within
+your organization, if you meet the following conditions:
+ Copies in source code must include the copyright notice and this
+ Software License Agreement.
+ Copies in binary form must include the copyright notice and this
+ Software License Agreement in the documentation and/or other
+ materials provided with the copy.
+
+You may modify a copy or copies of the Software or any portion of it,
+thus forming a work based on the Software, and distribute copies of such
+work outside your organization, if you meet all of the following
+conditions:
+ Copies in source code must include the copyright notice and this
+ Software License Agreement;
+ Copies in binary form must include the copyright notice and this
+ Software License Agreement in the documentation and/or other
+ materials provided with the copy;
+ Modified copies and works based on the Software must carry prominent
+ notices stating that you changed specified portions of the Software.
+
+Portions of the Software resulted from work developed under a U.S.
+Government contract and are subject to the following license: the
+Government is granted for itself and others acting on its behalf a
+paid-up, nonexclusive, irrevocable worldwide license in this computer
+software to reproduce, prepare derivative works, and perform publicly
+and display publicly.
+
+WARRANTY DISCLAIMER. THE SOFTWARE IS SUPPLIED "AS IS" WITHOUT WARRANTY
+OF ANY KIND. THE COPYRIGHT HOLDERS, THEIR THIRD PARTY LICENSORS, THE
+UNITED STATES, THE UNITED STATES DEPARTMENT OF ENERGY, AND THEIR
+EMPLOYEES: (1) DISCLAIM ANY WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
+BUT NOT LIMITED TO ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NON-INFRINGEMENT, (2) DO NOT ASSUME
+ANY LEGAL LIABILITY OR RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS, OR
+USEFULNESS OF THE SOFTWARE, (3) DO NOT REPRESENT THAT USE OF THE
+SOFTWARE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS, (4) DO NOT WARRANT
+THAT THE SOFTWARE WILL FUNCTION UNINTERRUPTED, THAT IT IS ERROR-FREE OR
+THAT ANY ERRORS WILL BE CORRECTED.
+
+LIMITATION OF LIABILITY. IN NO EVENT WILL THE COPYRIGHT HOLDERS, THEIR
+THIRD PARTY LICENSORS, THE UNITED STATES, THE UNITED STATES DEPARTMENT
+OF ENERGY, OR THEIR EMPLOYEES: BE LIABLE FOR ANY INDIRECT, INCIDENTAL,
+CONSEQUENTIAL, SPECIAL OR PUNITIVE DAMAGES OF ANY KIND OR NATURE,
+INCLUDING BUT NOT LIMITED TO LOSS OF PROFITS OR LOSS OF DATA, FOR ANY
+REASON WHATSOEVER, WHETHER SUCH LIABILITY IS ASSERTED ON THE BASIS OF
+CONTRACT, TORT (INCLUDING NEGLIGENCE OR STRICT LIABILITY), OR OTHERWISE,
+EVEN IF ANY OF SAID PARTIES HAS BEEN WARNED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGES.
+
+The "Software", below, refers to EPICS archiver appliance (in either
+source code, or binary form and accompanying documentation). Each
+licensee is addressed as "you" or "Licensee."
+
+The copyright holders shown above and their third-party licensors hereby
+grant Licensee a royalty-free nonexclusive license, subject to the
+limitations stated herein and U.S. Government license rights.
+
+You may modify and make a copy or copies of the Software for use within
+your organization, if you meet the following conditions:
+ Copies in source code must include the copyright notice and this
+ Software License Agreement.
+ Copies in binary form must include the copyright notice and this
+ Software License Agreement in the documentation and/or other
+ materials provided with the copy.
+
+You may modify a copy or copies of the Software or any portion of it,
+thus forming a work based on the Software, and distribute copies of such
+work outside your organization, if you meet all of the following
+conditions:
+ Copies in source code must include the copyright notice and this
+ Software License Agreement;
+ Copies in binary form must include the copyright notice and this
+ Software License Agreement in the documentation and/or other
+ materials provided with the copy;
+ Modified copies and works based on the Software must carry prominent
+ notices stating that you changed specified portions of the Software.
+*/
+
package EPICS;
option java_package = "org.apache.plc4x.merlot.api.PB";
option java_outer_classname = "EPICSEvent";
message FieldValue {
- required string name = 1;
- required string val = 2;
+ required string name = 1;
+ required string val = 2;
}
message ScalarString {
@@ -98,7 +185,7 @@ message VectorString {
optional bool fieldactualchange = 8;
}
-// VectorChar is the same as ScalarChar as we use ByteString for both
+// VectorChar is the same as ScalarChar as we use ByteString for both.
message VectorChar {
required uint32 secondsintoyear = 1;
required uint32 nano = 2;
@@ -166,7 +253,8 @@ message VectorDouble {
optional bool fieldactualchange = 8;
}
-// A generic v4 container; we simply store the bytes as obtained from EPICS v4
as the val.
+// A generic v4 container; we simply store the bytes as obtained from
+// EPICS v4 as the val.
message V4GenericBytes {
required uint32 secondsintoyear = 1;
required uint32 nano = 2;
@@ -176,43 +264,46 @@ message V4GenericBytes {
optional uint32 repeatcount = 6;
repeated FieldValue fieldvalues = 7;
optional bool fieldactualchange = 8;
- // EPICS V4 user tag
+ // EPICS V4 user tag.
optional uint32 userTag = 9;
}
-// An enumeration that indicates what PB message should be used to unmarshall
the following chunk of data
-// This is a copy of ArchDBRTypes and the numbers must match the integermap in
ArchDBRTypes for the reverse lookup to work
-// Look at DBR2PBTypeMapping to see how we can construct a hashmap that
unmarshalls an appropriate language type based on this enum.
+// An enumeration that indicates what PB message should be used to
+// unmarshall the following chunk of data.
+// This is a copy of ArchDBRTypes and the numbers must match the
+// integermap in ArchDBRTypes for the reverse lookup to work.
+// Look at DBR2PBTypeMapping to see how we can construct a hashmap that
+// unmarshalls an appropriate language type based on this enum.
enum PayloadType {
- SCALAR_STRING = 0;
- SCALAR_SHORT = 1;
- SCALAR_FLOAT = 2;
- SCALAR_ENUM = 3;
- SCALAR_BYTE = 4;
- SCALAR_INT = 5;
- SCALAR_DOUBLE = 6;
- WAVEFORM_STRING = 7;
- WAVEFORM_SHORT = 8;
- WAVEFORM_FLOAT = 9;
- WAVEFORM_ENUM = 10;
- WAVEFORM_BYTE = 11;
- WAVEFORM_INT = 12;
- WAVEFORM_DOUBLE = 13;
- V4_GENERIC_BYTES = 14;
-}
-
-// A payload info is the first line in a chunk of data sent back to the client.
-// It tells you how to unmarshall, the pvname and the year for the data
-// It also has a lot of optional fields
+ SCALAR_STRING = 0;
+ SCALAR_SHORT = 1;
+ SCALAR_FLOAT = 2;
+ SCALAR_ENUM = 3;
+ SCALAR_BYTE = 4;
+ SCALAR_INT = 5;
+ SCALAR_DOUBLE = 6;
+ WAVEFORM_STRING = 7;
+ WAVEFORM_SHORT = 8;
+ WAVEFORM_FLOAT = 9;
+ WAVEFORM_ENUM = 10;
+ WAVEFORM_BYTE = 11;
+ WAVEFORM_INT = 12;
+ WAVEFORM_DOUBLE = 13;
+ V4_GENERIC_BYTES = 14;
+}
+
+// A payload info is the first line in a chunk of data sent back to the
+// client. It tells you how to unmarshall, the pvname and the year for
+// the data. It also has a lot of optional fields.
message PayloadInfo {
required PayloadType type = 1;
required string pvname = 2;
required int32 year = 3;
optional int32 elementCount = 4;
-// Items from 5 to 14 are no longer to be used.
-// Stick these into the headers using the field names
-// For example, units comes in as EGU in the headers.
+ // Items from 5 to 14 are no longer to be used.
+ // Stick these into the headers using the field names.
+ // For example, units comes in as EGU in the headers.
optional double unused00 = 5;
optional double unused01 = 6;
optional double unused02 = 7;
@@ -223,6 +314,6 @@ message PayloadInfo {
optional double unused07 = 12;
optional double unused08 = 13;
optional string unused09 = 14;
-// End of unused elements
+ // End of unused elements.
repeated FieldValue headers = 15;
}
diff --git
a/plc4j/tools/merlot/org.apache.plc4x.merlot.das.api/src/main/resources/proto/das.proto
b/plc4j/tools/merlot/org.apache.plc4x.merlot.das.api/src/main/resources/proto/das.proto
index 896071d..0c03f56 100644
---
a/plc4j/tools/merlot/org.apache.plc4x.merlot.das.api/src/main/resources/proto/das.proto
+++
b/plc4j/tools/merlot/org.apache.plc4x.merlot.das.api/src/main/resources/proto/das.proto
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * https://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.
+ */
syntax = "proto3";
option java_multiple_files = true;
diff --git
a/plc4j/tools/merlot/org.apache.plc4x.merlot.das.api/src/main/resources/proto/helloworld.proto
b/plc4j/tools/merlot/org.apache.plc4x.merlot.das.api/src/main/resources/proto/helloworld.proto
index c585275..d5ed9ae 100644
---
a/plc4j/tools/merlot/org.apache.plc4x.merlot.das.api/src/main/resources/proto/helloworld.proto
+++
b/plc4j/tools/merlot/org.apache.plc4x.merlot.das.api/src/main/resources/proto/helloworld.proto
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * https://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.
+ */
syntax = "proto3";
option java_multiple_files = true;
diff --git
a/plc4j/tools/merlot/org.apache.plc4x.merlot.das.api/src/main/resources/proto/modbus.proto
b/plc4j/tools/merlot/org.apache.plc4x.merlot.das.api/src/main/resources/proto/modbus.proto
index 11c4c0d..d1a981a 100644
---
a/plc4j/tools/merlot/org.apache.plc4x.merlot.das.api/src/main/resources/proto/modbus.proto
+++
b/plc4j/tools/merlot/org.apache.plc4x.merlot.das.api/src/main/resources/proto/modbus.proto
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * https://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.
+ */
syntax = "proto3";
option java_multiple_files = true;
diff --git
a/plc4j/tools/merlot/org.apache.plc4x.merlot.das.api/src/main/resources/proto/ping.proto
b/plc4j/tools/merlot/org.apache.plc4x.merlot.das.api/src/main/resources/proto/ping.proto
index 704ac39..c0ac6fe 100644
---
a/plc4j/tools/merlot/org.apache.plc4x.merlot.das.api/src/main/resources/proto/ping.proto
+++
b/plc4j/tools/merlot/org.apache.plc4x.merlot.das.api/src/main/resources/proto/ping.proto
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * https://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.
+ */
syntax = "proto3";
option java_multiple_files = true;
diff --git
a/plc4j/tools/merlot/org.apache.plc4x.merlot.das.api/src/test/java/org/apache/plc4x/merlot/api/ByteBufJUnitTest.java
b/plc4j/tools/merlot/org.apache.plc4x.merlot.das.api/src/test/java/org/apache/plc4x/merlot/api/ByteBufJUnitTest.java
index 05fb923..fa24b99 100644
---
a/plc4j/tools/merlot/org.apache.plc4x.merlot.das.api/src/test/java/org/apache/plc4x/merlot/api/ByteBufJUnitTest.java
+++
b/plc4j/tools/merlot/org.apache.plc4x.merlot.das.api/src/test/java/org/apache/plc4x/merlot/api/ByteBufJUnitTest.java
@@ -1,6 +1,20 @@
/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt
to change this license
- * Click
nbfs://nbhost/SystemFileSystem/Templates/UnitTests/JUnit5TestClass.java to edit
this template
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * https://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 org.apache.plc4x.merlot.api;
diff --git
a/plc4j/tools/merlot/org.apache.plc4x.merlot.das.api/src/test/java/org/apache/plc4x/merlot/api/SampleGuidelinesProofTest.java
b/plc4j/tools/merlot/org.apache.plc4x.merlot.das.api/src/test/java/org/apache/plc4x/merlot/api/SampleGuidelinesProofTest.java
index 25e3c5b..f0b281b 100644
---
a/plc4j/tools/merlot/org.apache.plc4x.merlot.das.api/src/test/java/org/apache/plc4x/merlot/api/SampleGuidelinesProofTest.java
+++
b/plc4j/tools/merlot/org.apache.plc4x.merlot.das.api/src/test/java/org/apache/plc4x/merlot/api/SampleGuidelinesProofTest.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * https://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 org.apache.plc4x.merlot.api;
import org.junit.jupiter.api.Test;
diff --git
a/plc4j/tools/merlot/org.apache.plc4x.merlot.drv.s7/src/docs/asciidoc/S7PlcModel.puml
b/plc4j/tools/merlot/org.apache.plc4x.merlot.drv.s7/src/docs/asciidoc/S7PlcModel.puml
index 22b857b..77e9123 100644
---
a/plc4j/tools/merlot/org.apache.plc4x.merlot.drv.s7/src/docs/asciidoc/S7PlcModel.puml
+++
b/plc4j/tools/merlot/org.apache.plc4x.merlot.drv.s7/src/docs/asciidoc/S7PlcModel.puml
@@ -1,3 +1,21 @@
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * https://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.
+ *
@startgantt
[InternalPlcItem] requires 60 days and is colored in Lavender/LightBlue
note bottom
diff --git
a/plc4j/tools/merlot/org.apache.plc4x.merlot.drv.s7/src/docs/asciidoc/s7notes.adoc
b/plc4j/tools/merlot/org.apache.plc4x.merlot.drv.s7/src/docs/asciidoc/s7notes.adoc
index d3af535..105c0ae 100644
---
a/plc4j/tools/merlot/org.apache.plc4x.merlot.drv.s7/src/docs/asciidoc/s7notes.adoc
+++
b/plc4j/tools/merlot/org.apache.plc4x.merlot.drv.s7/src/docs/asciidoc/s7notes.adoc
@@ -1,3 +1,23 @@
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * https://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.
+ *
+
+
= Main title
Your name
v1.0
