You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by ha...@apache.org on 2020/11/17 10:17:38 UTC
[incubator-hop] branch master updated: HOP-2188 (#385)
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
The following commit(s) were added to refs/heads/master by this push:
new 391f237 HOP-2188 (#385)
391f237 is described below
commit 391f2375f9d8557eb52deacc76c2d1959c1d9d30
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Tue Nov 17 11:17:30 2020 +0100
HOP-2188 (#385)
Fix headers and add RAT check to PR-build
---
.github/workflows/pr_build.yml | 2 +
.../org/apache/hop/core/util/SingletonUtil.java | 16 +++++
.../hop/base/MockFilenameChangeListener.java | 16 +++++
.../apache/hop/beam/core/fn/StaticHopRowFn.java | 16 +++++
.../apache/hop/pipeline/transforms/fake/Fake.java | 23 +++----
.../hop/pipeline/transforms/fake/FakeData.java | 23 +++----
.../hop/pipeline/transforms/fake/FakeDialog.java | 23 +++----
.../hop/pipeline/transforms/fake/FakeField.java | 16 +++++
.../hop/pipeline/transforms/fake/FakeMeta.java | 23 +++----
.../hop/pipeline/transforms/fake/FakerType.java | 16 +++++
.../MappingIODefinitionLoadSaveValidator.java | 16 +++++
.../MappingParametersLoadSaveValidator.java | 16 +++++
.../transforms/streamschemamerge/SchemaMapper.java | 19 +++++-
.../transforms/streamschemamerge/StreamSchema.java | 37 +++++------
.../streamschemamerge/StreamSchemaData.java | 37 +++++------
.../streamschemamerge/StreamSchemaDialog.java | 37 +++++------
.../streamschemamerge/StreamSchemaMeta.java | 38 +++++-------
.../streamschemamerge/RowTransformCollector.java | 23 +++----
.../streamschemamerge/TestFailedException.java | 23 +++----
.../streamschemamerge/TestUtilities.java | 23 +++----
.../messages/messages_en_US.properties.mine | 72 ----------------------
21 files changed, 257 insertions(+), 258 deletions(-)
diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml
index 45467ab..d2c4c3d 100644
--- a/.github/workflows/pr_build.yml
+++ b/.github/workflows/pr_build.yml
@@ -34,5 +34,7 @@ jobs:
uses: actions/setup-java@v1
with:
java-version: 1.8
+ - name: RAT Check
+ run: mvn clean apache-rat:check
- name: Build with Maven
run: mvn clean install -U -B -e -fae -V -Dmaven.compiler.fork=true -Dsurefire.rerunFailingTestsCount=2 -P !assemblies -Djacoco.skip=true --file pom.xml
\ No newline at end of file
diff --git a/core/src/main/java/org/apache/hop/core/util/SingletonUtil.java b/core/src/main/java/org/apache/hop/core/util/SingletonUtil.java
index 11e9ef6..e3eedbd 100644
--- a/core/src/main/java/org/apache/hop/core/util/SingletonUtil.java
+++ b/core/src/main/java/org/apache/hop/core/util/SingletonUtil.java
@@ -1,3 +1,19 @@
+/*
+ * 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
+ *
+ * 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 org.apache.hop.core.util;
import org.apache.hop.core.exception.HopException;
diff --git a/engine/src/test/java/org/apache/hop/base/MockFilenameChangeListener.java b/engine/src/test/java/org/apache/hop/base/MockFilenameChangeListener.java
index 4f02fc3..5e6ec78 100644
--- a/engine/src/test/java/org/apache/hop/base/MockFilenameChangeListener.java
+++ b/engine/src/test/java/org/apache/hop/base/MockFilenameChangeListener.java
@@ -1,3 +1,19 @@
+/*
+ * 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
+ *
+ * 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 org.apache.hop.base;
import org.apache.hop.core.listeners.IFilenameChangedListener;
diff --git a/plugins/engines/beam/src/main/java/org/apache/hop/beam/core/fn/StaticHopRowFn.java b/plugins/engines/beam/src/main/java/org/apache/hop/beam/core/fn/StaticHopRowFn.java
index 6ce9bf4..80bb8f8 100644
--- a/plugins/engines/beam/src/main/java/org/apache/hop/beam/core/fn/StaticHopRowFn.java
+++ b/plugins/engines/beam/src/main/java/org/apache/hop/beam/core/fn/StaticHopRowFn.java
@@ -1,3 +1,19 @@
+/*
+ * 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
+ *
+ * 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 org.apache.hop.beam.core.fn;
import org.apache.beam.sdk.metrics.Counter;
diff --git a/plugins/transforms/fake/src/main/java/org/apache/hop/pipeline/transforms/fake/Fake.java b/plugins/transforms/fake/src/main/java/org/apache/hop/pipeline/transforms/fake/Fake.java
index 1dbcf2e..48e1f50 100644
--- a/plugins/transforms/fake/src/main/java/org/apache/hop/pipeline/transforms/fake/Fake.java
+++ b/plugins/transforms/fake/src/main/java/org/apache/hop/pipeline/transforms/fake/Fake.java
@@ -1,24 +1,19 @@
-/*! ******************************************************************************
+/*
+ * 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
*
- * Hop : The Hop Orchestration Platform
- *
- * http://www.project-hop.org
- *
- *******************************************************************************
- *
- * 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
+ * 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 org.apache.hop.pipeline.transforms.fake;
diff --git a/plugins/transforms/fake/src/main/java/org/apache/hop/pipeline/transforms/fake/FakeData.java b/plugins/transforms/fake/src/main/java/org/apache/hop/pipeline/transforms/fake/FakeData.java
index abae590..b4e2f68 100644
--- a/plugins/transforms/fake/src/main/java/org/apache/hop/pipeline/transforms/fake/FakeData.java
+++ b/plugins/transforms/fake/src/main/java/org/apache/hop/pipeline/transforms/fake/FakeData.java
@@ -1,24 +1,19 @@
-/*! ******************************************************************************
+/*
+ * 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
*
- * Hop : The Hop Orchestration Platform
- *
- * http://www.project-hop.org
- *
- *******************************************************************************
- *
- * 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
+ * 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 org.apache.hop.pipeline.transforms.fake;
diff --git a/plugins/transforms/fake/src/main/java/org/apache/hop/pipeline/transforms/fake/FakeDialog.java b/plugins/transforms/fake/src/main/java/org/apache/hop/pipeline/transforms/fake/FakeDialog.java
index 7aa368e..3c32ad9 100644
--- a/plugins/transforms/fake/src/main/java/org/apache/hop/pipeline/transforms/fake/FakeDialog.java
+++ b/plugins/transforms/fake/src/main/java/org/apache/hop/pipeline/transforms/fake/FakeDialog.java
@@ -1,24 +1,19 @@
-/*! ******************************************************************************
+/*
+ * 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
*
- * Hop : The Hop Orchestration Platform
- *
- * http://www.project-hop.org
- *
- *******************************************************************************
- *
- * 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
+ * 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 org.apache.hop.pipeline.transforms.fake;
diff --git a/plugins/transforms/fake/src/main/java/org/apache/hop/pipeline/transforms/fake/FakeField.java b/plugins/transforms/fake/src/main/java/org/apache/hop/pipeline/transforms/fake/FakeField.java
index c319b45..0a1ab5c 100644
--- a/plugins/transforms/fake/src/main/java/org/apache/hop/pipeline/transforms/fake/FakeField.java
+++ b/plugins/transforms/fake/src/main/java/org/apache/hop/pipeline/transforms/fake/FakeField.java
@@ -1,3 +1,19 @@
+/*
+ * 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
+ *
+ * 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 org.apache.hop.pipeline.transforms.fake;
import org.apache.commons.lang.StringUtils;
diff --git a/plugins/transforms/fake/src/main/java/org/apache/hop/pipeline/transforms/fake/FakeMeta.java b/plugins/transforms/fake/src/main/java/org/apache/hop/pipeline/transforms/fake/FakeMeta.java
index 49a79f7..215da16 100644
--- a/plugins/transforms/fake/src/main/java/org/apache/hop/pipeline/transforms/fake/FakeMeta.java
+++ b/plugins/transforms/fake/src/main/java/org/apache/hop/pipeline/transforms/fake/FakeMeta.java
@@ -1,24 +1,19 @@
-/*! ******************************************************************************
+/*
+ * 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
*
- * Hop : The Hop Orchestration Platform
- *
- * http://www.project-hop.org
- *
- *******************************************************************************
- *
- * 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
+ * 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 org.apache.hop.pipeline.transforms.fake;
diff --git a/plugins/transforms/fake/src/main/java/org/apache/hop/pipeline/transforms/fake/FakerType.java b/plugins/transforms/fake/src/main/java/org/apache/hop/pipeline/transforms/fake/FakerType.java
index 47aae32..e2495a0 100644
--- a/plugins/transforms/fake/src/main/java/org/apache/hop/pipeline/transforms/fake/FakerType.java
+++ b/plugins/transforms/fake/src/main/java/org/apache/hop/pipeline/transforms/fake/FakerType.java
@@ -1,3 +1,19 @@
+/*
+ * 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
+ *
+ * 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 org.apache.hop.pipeline.transforms.fake;
public enum FakerType {
diff --git a/plugins/transforms/mapping/src/test/java/org/apache/hop/pipeline/transforms/mapping/MappingIODefinitionLoadSaveValidator.java b/plugins/transforms/mapping/src/test/java/org/apache/hop/pipeline/transforms/mapping/MappingIODefinitionLoadSaveValidator.java
index dc4abe6..848f423 100644
--- a/plugins/transforms/mapping/src/test/java/org/apache/hop/pipeline/transforms/mapping/MappingIODefinitionLoadSaveValidator.java
+++ b/plugins/transforms/mapping/src/test/java/org/apache/hop/pipeline/transforms/mapping/MappingIODefinitionLoadSaveValidator.java
@@ -1,3 +1,19 @@
+/*
+ * 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
+ *
+ * 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 org.apache.hop.pipeline.transforms.mapping;
import org.apache.hop.pipeline.transforms.loadsave.validator.IFieldLoadSaveValidator;
diff --git a/plugins/transforms/mapping/src/test/java/org/apache/hop/pipeline/transforms/mapping/MappingParametersLoadSaveValidator.java b/plugins/transforms/mapping/src/test/java/org/apache/hop/pipeline/transforms/mapping/MappingParametersLoadSaveValidator.java
index 36e081d..5a5bcef 100644
--- a/plugins/transforms/mapping/src/test/java/org/apache/hop/pipeline/transforms/mapping/MappingParametersLoadSaveValidator.java
+++ b/plugins/transforms/mapping/src/test/java/org/apache/hop/pipeline/transforms/mapping/MappingParametersLoadSaveValidator.java
@@ -1,3 +1,19 @@
+/*
+ * 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
+ *
+ * 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 org.apache.hop.pipeline.transforms.mapping;
import org.apache.hop.pipeline.transforms.loadsave.validator.IFieldLoadSaveValidator;
diff --git a/plugins/transforms/streamschemamerge/src/main/java/org/apache/hop/pipeline/transforms/streamschemamerge/SchemaMapper.java b/plugins/transforms/streamschemamerge/src/main/java/org/apache/hop/pipeline/transforms/streamschemamerge/SchemaMapper.java
index e8f18d2..4477bd4 100644
--- a/plugins/transforms/streamschemamerge/src/main/java/org/apache/hop/pipeline/transforms/streamschemamerge/SchemaMapper.java
+++ b/plugins/transforms/streamschemamerge/src/main/java/org/apache/hop/pipeline/transforms/streamschemamerge/SchemaMapper.java
@@ -1,6 +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
+ *
+ * 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 org.apache.hop.pipeline.transforms.streamschemamerge;
-
import org.apache.hop.core.exception.HopPluginException;
import org.apache.hop.core.row.IRowMeta;
import org.apache.hop.core.row.IValueMeta;
@@ -9,8 +24,6 @@ import org.apache.hop.core.row.value.ValueMetaFactory;
import java.util.Collections;
import java.util.HashSet;
-
-
/**
* Takes in RowMetas and find the union of them. Then maps the field of each row to its final destination
*/
diff --git a/plugins/transforms/streamschemamerge/src/main/java/org/apache/hop/pipeline/transforms/streamschemamerge/StreamSchema.java b/plugins/transforms/streamschemamerge/src/main/java/org/apache/hop/pipeline/transforms/streamschemamerge/StreamSchema.java
index 0d82fd5..67b04f4 100755
--- a/plugins/transforms/streamschemamerge/src/main/java/org/apache/hop/pipeline/transforms/streamschemamerge/StreamSchema.java
+++ b/plugins/transforms/streamschemamerge/src/main/java/org/apache/hop/pipeline/transforms/streamschemamerge/StreamSchema.java
@@ -1,24 +1,19 @@
-/*! ******************************************************************************
-*
-* Hop : The Hop Orchestration Platform
-*
-* Copyright (C) 2002-2013 by Pentaho : http://www.pentaho.com
-*
-*******************************************************************************
-*
-* 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.
-*
-******************************************************************************/
+/*
+ * 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
+ *
+ * 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 org.apache.hop.pipeline.transforms.streamschemamerge;
diff --git a/plugins/transforms/streamschemamerge/src/main/java/org/apache/hop/pipeline/transforms/streamschemamerge/StreamSchemaData.java b/plugins/transforms/streamschemamerge/src/main/java/org/apache/hop/pipeline/transforms/streamschemamerge/StreamSchemaData.java
index a67ca71..404fd5d 100644
--- a/plugins/transforms/streamschemamerge/src/main/java/org/apache/hop/pipeline/transforms/streamschemamerge/StreamSchemaData.java
+++ b/plugins/transforms/streamschemamerge/src/main/java/org/apache/hop/pipeline/transforms/streamschemamerge/StreamSchemaData.java
@@ -1,24 +1,19 @@
-/*! ******************************************************************************
-*
-* Hop : The Hop Orchestration Platform
-*
-* Copyright (C) 2002-2013 by Pentaho : http://www.pentaho.com
-*
-*******************************************************************************
-*
-* 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.
-*
-******************************************************************************/
+/*
+ * 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
+ *
+ * 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 org.apache.hop.pipeline.transforms.streamschemamerge;
diff --git a/plugins/transforms/streamschemamerge/src/main/java/org/apache/hop/pipeline/transforms/streamschemamerge/StreamSchemaDialog.java b/plugins/transforms/streamschemamerge/src/main/java/org/apache/hop/pipeline/transforms/streamschemamerge/StreamSchemaDialog.java
index 419d0cd..f83b565 100644
--- a/plugins/transforms/streamschemamerge/src/main/java/org/apache/hop/pipeline/transforms/streamschemamerge/StreamSchemaDialog.java
+++ b/plugins/transforms/streamschemamerge/src/main/java/org/apache/hop/pipeline/transforms/streamschemamerge/StreamSchemaDialog.java
@@ -1,24 +1,19 @@
-/*! ******************************************************************************
-*
-* Hop : The Hop Orchestration Platform
-*
-* Copyright (C) 2002-2013 by Pentaho : http://www.pentaho.com
-*
-*******************************************************************************
-*
-* 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.
-*
-******************************************************************************/
+/*
+ * 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
+ *
+ * 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 org.apache.hop.pipeline.transforms.streamschemamerge;
diff --git a/plugins/transforms/streamschemamerge/src/main/java/org/apache/hop/pipeline/transforms/streamschemamerge/StreamSchemaMeta.java b/plugins/transforms/streamschemamerge/src/main/java/org/apache/hop/pipeline/transforms/streamschemamerge/StreamSchemaMeta.java
index e088404..e8dfd74 100755
--- a/plugins/transforms/streamschemamerge/src/main/java/org/apache/hop/pipeline/transforms/streamschemamerge/StreamSchemaMeta.java
+++ b/plugins/transforms/streamschemamerge/src/main/java/org/apache/hop/pipeline/transforms/streamschemamerge/StreamSchemaMeta.java
@@ -1,25 +1,19 @@
-/*! ******************************************************************************
-*
-* Hop : The Hop Orchestration Platform
-*
-* Copyright (C) 2002-2013 by Pentaho : http://www.pentaho.com
-*
-*******************************************************************************
-*
-* 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.
-*
-******************************************************************************/
-
+/*
+ * 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
+ *
+ * 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 org.apache.hop.pipeline.transforms.streamschemamerge;
import com.sun.corba.se.spi.ior.ObjectId;
diff --git a/plugins/transforms/streamschemamerge/src/test/java/org/apache/hop/pipeline/transforms/streamschemamerge/RowTransformCollector.java b/plugins/transforms/streamschemamerge/src/test/java/org/apache/hop/pipeline/transforms/streamschemamerge/RowTransformCollector.java
index 9c379a6..799a9b8 100755
--- a/plugins/transforms/streamschemamerge/src/test/java/org/apache/hop/pipeline/transforms/streamschemamerge/RowTransformCollector.java
+++ b/plugins/transforms/streamschemamerge/src/test/java/org/apache/hop/pipeline/transforms/streamschemamerge/RowTransformCollector.java
@@ -1,24 +1,19 @@
-/*! ******************************************************************************
+/*
+ * 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
*
- * Hop : The Hop Orchestration Platform
- *
- * Copyright (C) 2002-2013 by Pentaho : http://www.pentaho.com
- *
- *******************************************************************************
- *
- * 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
+ * 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 org.apache.hop.pipeline.transforms.streamschemamerge;
diff --git a/plugins/transforms/streamschemamerge/src/test/java/org/apache/hop/pipeline/transforms/streamschemamerge/TestFailedException.java b/plugins/transforms/streamschemamerge/src/test/java/org/apache/hop/pipeline/transforms/streamschemamerge/TestFailedException.java
index 72f156c..da2662e 100755
--- a/plugins/transforms/streamschemamerge/src/test/java/org/apache/hop/pipeline/transforms/streamschemamerge/TestFailedException.java
+++ b/plugins/transforms/streamschemamerge/src/test/java/org/apache/hop/pipeline/transforms/streamschemamerge/TestFailedException.java
@@ -1,24 +1,19 @@
-/*! ******************************************************************************
+/*
+ * 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
*
- * Hop : The Hop Orchestration Platform
- *
- * Copyright (C) 2002-2013 by Pentaho : http://www.pentaho.com
- *
- *******************************************************************************
- *
- * 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
+ * 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 org.apache.hop.pipeline.transforms.streamschemamerge;
diff --git a/plugins/transforms/streamschemamerge/src/test/java/org/apache/hop/pipeline/transforms/streamschemamerge/TestUtilities.java b/plugins/transforms/streamschemamerge/src/test/java/org/apache/hop/pipeline/transforms/streamschemamerge/TestUtilities.java
index 996ffc6..c32f127 100755
--- a/plugins/transforms/streamschemamerge/src/test/java/org/apache/hop/pipeline/transforms/streamschemamerge/TestUtilities.java
+++ b/plugins/transforms/streamschemamerge/src/test/java/org/apache/hop/pipeline/transforms/streamschemamerge/TestUtilities.java
@@ -1,24 +1,19 @@
-/*! ******************************************************************************
+/*
+ * 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
*
- * Hop : The Hop Orchestration Platform
- *
- * Copyright (C) 2002-2013 by Pentaho : http://www.pentaho.com
- *
- *******************************************************************************
- *
- * 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
+ * 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 org.apache.hop.pipeline.transforms.streamschemamerge;
diff --git a/plugins/transforms/userdefinedjavaclass/src/main/resources/org/apache/hop/pipeline/transforms/userdefinedjavaclass/messages/messages_en_US.properties.mine b/plugins/transforms/userdefinedjavaclass/src/main/resources/org/apache/hop/pipeline/transforms/userdefinedjavaclass/messages/messages_en_US.properties.mine
deleted file mode 100644
index 4dac8b5..0000000
--- a/plugins/transforms/userdefinedjavaclass/src/main/resources/org/apache/hop/pipeline/transforms/userdefinedjavaclass/messages/messages_en_US.properties.mine
+++ /dev/null
@@ -1,72 +0,0 @@
-#File generated by Hop Translator for package 'org.pentaho.di.pipeline.steps.userdefinedjavaclass' in locale 'en_US'
-#
-#
-#Fri Mar 26 22:43:29 CET 2010
-UserDefinedJavaClassCodeSnippits.categories.OTHER=Uncommon use
-UserDefinedJavaClassDialog.NoTransformClassSet=No class tab has been set as the transform class\! Should the first tab set as active Script?
-UserDefinedJavaClassCodeSnippits.categories.STATUS=Transform status
-UserDefinedJavaClassDialog.OutputFields.Label=Output fields
-UserDefinedJavaClassDialog.Snippits.Label=Code Snippits
-UserDefinedJavaClassDialog.Tabs.Fields.Title=Fields
-UserDefinedJavaClassDialog.Tabs.Info.Title=Info steps
-UserDefinedJavaClassDialog.TestFailed.DialogTitle=Test failed
-UserDefinedJavaClassDialog.TargetTransforms.Label=Target steps\:
-UserDefinedJavaClassDialog.DeleteItem.Label=Delete Item
-UserDefinedJavaClassDialog.GettingFields.Label=Getting fields...please wait
-UserDefinedJavaClassMeta.CheckResult.ConnectedTransformOK2=Transform is receiving info from other steps.
-TransformClassBase.Exception.UnableToFindTargetRowSetForTransform=Unable to find target row set for step ''{0}''
-TransformClassBase.Exception.UnableToFindInfoRowSetForTransform=Unable to find info row set for step ''{0}''
-UserDefinedJavaClassDialog.Tabs.Parameters.Title=Parameters
-UserDefinedJavaClassDialog.ColumnInfo.Length=Length
-UserDefinedJavaClassDialog.InputFields.Label=Input fields
-UserDefinedJavaClassDialog.ColumnInfo.TransformName=Transform
-UserDefinedJavaClassDialog.ClassesAndSnippits.Label=Classes and code fragments\:
-UserDefinedJavaClassDialog.AddCopy=Add copy
-TransformClassBase.Exception.UnableToFindInfoTransformNameForTag=Unable to find info step name for tag ''{0}''
-UserDefinedJavaClassDialog.ColumnInfo.ParameterDescription=Description
-UserDefinedJavaClassDialog.ConfirmDeleteItem.Label=Do you really want to delete {0} ?
-UserDefinedJavaClassDialog.ClearResultFields.Label=Clear the result fields?
-UserDefinedJavaClassDialog.Class.Label=Class code
-UserDefinedJavaClassDialog.Sample.Label=Show Sample
-UserDefinedJavaClassDialog.SetTransformClass=Set as Transform Class
-UserDefinedJavaClassDialog.WarningDialogChanged.Title=Warning, content changed\!
-UserDefinedJavaClassDialog.Position.Label=Line \#\: 0
-UserDefinedJavaClassMeta.Exception.UnableToSaveTransformInfo=Unable to save step information to the repository for id_step\=
-UserDefinedJavaClassCodeSnippits.categories.LOGGING=Transform logging
-UserDefinedJavaClassDialog.RemoveClassType=Remove class type
-UserDefinedJavaClassDialog.ColumnInfo.ParameterTag=Tag
-UserDefinedJavaClassMeta.CheckResult.NoInputReceived=No input received from other steps\!
-UserDefinedJavaClassDialog.Shell.Title=User defined Java class
-UserDefinedJavaClassDialog.Rename.Label=Rename
-UserDefinedJavaClassDialog.Tabs.Target.TooltipText=Use this tab to specify the target steps for this step
-UserDefinedJavaClassDialog.WarningDialogChanged.Message=The content of this dialog has changed\!{0}Are you sure you want to dispose of the changes and close this dialog?
-UserDefinedJavaClassDialog.ERROR.Label=ERROR
-UserDefinedJavaClassDialog.ColumnInfo.Type=Type
-UserDefinedJavaClassDialog.Parameters.Label=Parameters\:
-UserDefinedJavaClassDialog.Tabs.Parameters.TooltipText=The parameters specified and described in this tab can be accessed in the code using the getParameter(tag) method.
-UDJC.snippits.categories.LISTENERS=Listeners
-UserDefinedJavaClass.Exception.CookingError=Cooking error {0}
-UserDefinedJavaClassDialog.ColumnInfo.Precision=Precision
-UserDefinedJavaClassDialog.Tabs.Info.TooltipText=Use this tab to specify the info steps for this step
-UserDefinedJavaClassDialog.TransformName.Label=Transform name
-UserDefinedJavaClassDialog.ColumnInfo.TransformDescription=Description
-UserDefinedJavaClassCodeSnippits.categories.ROW=Row manipulation
-UserDefinedJavaClassDialog.Delete.Label=Delete
-UserDefinedJavaClassDialog.Tabs.Fields.TooltipText=Use this tab to specify the output fields of this step
-UserDefinedJavaClassMeta.Exception.UnexpectedErrorInReadingTransformInfo=Unexpected error reading step information from the repository
-UserDefinedJavaClassDialog.InfoTransforms.Label=Info steps\:
-UserDefinedJavaClassMeta.Exception.UnableToLoadTransformInfoFromXML=Unable to load step info from XML
-UserDefinedJavaClassDialog.Tabs.Target.Title=Target steps
-UserDefinedJavaClassDialog.TestClass.Button=\ &Test class
-UserDefinedJavaClassDialog.TestFailed.DialogMessage=Unable to get fields from previous steps because of an error
-TransformClassBase.Exception.UnableToFindTargetTransformNameForTag=Unable to find target step name for tag ''{0}''
-UserDefinedJavaClassDialog.AddNewTab=Add new
-UserDefinedJavaClassDialog.Position.Label2=Position\:
-UserDefinedJavaClassDialog.ColumnInfo.TransformTag=Tag
-UserDefinedJavaClassDialog.Fields.Label=Fields
-UserDefinedJavaClassCodeSnippits.categories.COMMON=Common use
-UserDefinedJavaClassCodeSnippits.categories.LISTENERS=Transform/Row listeners
-UserDefinedJavaClassDialog.Exception.CouldNotGetFields=Couldn''t get fields from previous steps, please connect all needed hops\!
-UserDefinedJavaClassDialog.Classes.Label=Classes
-UserDefinedJavaClassDialog.ColumnInfo.Filename=Fieldname
-UserDefinedJavaClassDialog.ColumnInfo.ParameterValue=Value