You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2021/01/17 19:01:05 UTC
[isis] 01/02: ISIS-2486: fixes up some missing licenses in prep for
M5
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2486-jdo-jpa-module-rationalize
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 0a789082271930a8b3f39b1f9f0e3b11e312cf05
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Jan 17 17:28:55 2021 +0000
ISIS-2486: fixes up some missing licenses in prep for M5
---
antora/pom.xml | 20 +++----
.../interaction/IsisModuleCoreInteraction.java | 22 +++++++-
.../executor/MemberExecutorServiceDefault.java | 62 ++++++++++++++--------
.../main/java/demoapp/dom/AppConfiguration.java | 18 +++++++
.../dom/ui/custom/geocoding/GeoapifyClient.java | 18 +++++++
.../java/demoapp/dom/ui/custom/latlng/LatLng.java | 18 +++++++
.../demoapp/dom/ui/custom/latlng/LatLngUtils.java | 18 +++++++
.../demoapp/dom/ui/custom/latlng/Latitude.java | 18 +++++++
.../demoapp/dom/ui/custom/latlng/Longitude.java | 18 +++++++
.../java/demoapp/dom/ui/custom/latlng/Zoom.java | 18 +++++++
.../java/demoapp/dom/ui/custom/vm/BoundingBox.java | 18 +++++++
.../geocoding/GeoapifyClientTest_geocode.java | 18 +++++++
.../ui/custom/WhereInTheWorldPanelFactory.java | 18 +++++++
.../kroviz/partials/design/dev-mindmap.adoc | 5 +-
incubator/pom.xml | 2 +-
isis-parent/pom.xml | 12 ++---
.../column/MandatoryFacetDerivedFromJpaColumn.java | 20 ++++++-
.../springdata/EmployeeManager_deleteEmployee.java | 24 +++++++--
18 files changed, 302 insertions(+), 45 deletions(-)
diff --git a/antora/pom.xml b/antora/pom.xml
index b180826..8b50776 100644
--- a/antora/pom.xml
+++ b/antora/pom.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- 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
+<!-- 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. -->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -73,6 +73,8 @@
<exclude>**/gradlew</exclude>
<exclude>**/gradlew.bat</exclude>
+ <exclude>**/supplemental-ui/**</exclude>
+
<exclude>**/intellij/launch/*.xml</exclude>
<exclude>**/META-INF/services/**</exclude>
diff --git a/core/interaction/src/main/java/org/apache/isis/core/interaction/IsisModuleCoreInteraction.java b/core/interaction/src/main/java/org/apache/isis/core/interaction/IsisModuleCoreInteraction.java
index fcb936e..5a54269 100644
--- a/core/interaction/src/main/java/org/apache/isis/core/interaction/IsisModuleCoreInteraction.java
+++ b/core/interaction/src/main/java/org/apache/isis/core/interaction/IsisModuleCoreInteraction.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
+ *
+ * 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.isis.core.interaction;
import org.springframework.context.annotation.Configuration;
@@ -8,10 +26,10 @@ import org.apache.isis.core.interaction.scope.InteractionScopeBeanFactoryPostPro
@Configuration
@Import({
-
+
InteractionScopeBeanFactoryPostProcessor.class,
InteractionAwareTransactionalBoundaryHandler.class
-
+
})
public class IsisModuleCoreInteraction {
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/executor/MemberExecutorServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/executor/MemberExecutorServiceDefault.java
index 4aa24a7..51ff5ae 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/executor/MemberExecutorServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/executor/MemberExecutorServiceDefault.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
+ *
+ * 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.isis.core.runtimeservices.executor;
import java.lang.reflect.Method;
@@ -60,9 +78,9 @@ import lombok.extern.log4j.Log4j2;
@Qualifier("Default")
@RequiredArgsConstructor(onConstructor_ = {@Inject})
@Log4j2
-public class MemberExecutorServiceDefault
+public class MemberExecutorServiceDefault
implements MemberExecutorService {
-
+
private final @Getter InteractionTracker isisInteractionTracker;
private final @Getter IsisConfiguration configuration;
private final @Getter ObjectManager objectManager;
@@ -72,17 +90,17 @@ implements MemberExecutorService {
private final @Getter Provider<ExecutionPublisher> executionPublisher;
private final @Getter MetamodelEventService metamodelEventService;
private final @Getter TransactionService transactionService;
-
+
@Override
public Optional<InternalInteraction> getInteraction() {
return isisInteractionTracker.currentInteraction()
.map(InternalInteraction.class::cast);
}
-
+
@Override
public ManagedObject invokeAction(
- final @NonNull ObjectAction owningAction,
- final @NonNull InteractionHead head,
+ final @NonNull ObjectAction owningAction,
+ final @NonNull InteractionHead head,
final @NonNull Can<ManagedObject> argumentAdapters,
final @NonNull InteractionInitiatedBy interactionInitiatedBy,
final @NonNull Method method,
@@ -92,13 +110,13 @@ implements MemberExecutorService {
_Assert.assertEquals(owningAction.getParameterCount(), argumentAdapters.size(),
"action's parameter count and provided argument count must match");
-
+
val interaction = getInteractionElseFail();
val command = interaction.getCommand();
-
+
command.updater().setPublishingEnabled(
CommandPublishingFacet.isPublishingEnabled(facetHolder));
-
+
val actionId = owningAction.getIdentifier().toClassAndNameIdentityString();
log.debug("about to invoke action {}", actionId);
@@ -156,13 +174,13 @@ implements MemberExecutorService {
}
return filteredIfRequired(method, returnedAdapter, interactionInitiatedBy);
-
+
}
@Override
public ManagedObject setOrClearProperty(
- final @NonNull OneToOneAssociation owningProperty,
+ final @NonNull OneToOneAssociation owningProperty,
final @NonNull InteractionHead head,
- final @NonNull ManagedObject newValueAdapter,
+ final @NonNull ManagedObject newValueAdapter,
final @NonNull InteractionInitiatedBy interactionInitiatedBy,
final @NonNull PropertyExecutorFactory propertyExecutorFactory,
final @NonNull FacetHolder facetHolder,
@@ -174,7 +192,7 @@ implements MemberExecutorService {
if( command==null ) {
return head.getTarget();
}
-
+
command.updater().setPublishingEnabled(
CommandPublishingFacet.isPublishingEnabled(facetHolder));
@@ -189,7 +207,7 @@ implements MemberExecutorService {
val propertyEdit = new Interaction.PropertyEdit(interaction, propertyId, target, argValue, targetMemberName, targetClass);
val executor = propertyExecutorFactory
- .createExecutor(newValueAdapter, owningProperty, targetManagedObject,
+ .createExecutor(newValueAdapter, owningProperty, targetManagedObject,
interactionInitiatedBy, head, editingVariant);
// sets up startedAt and completedAt on the execution, also manages the execution call graph
@@ -214,11 +232,11 @@ implements MemberExecutorService {
}
return getObjectManager().adapt(targetPojo);
-
+
}
// -- HELPER
-
+
private static String targetNameFor(ObjectAction owningAction, ManagedObject mixedInAdapter) {
return ObjectAction.Util.targetNameFor(owningAction, mixedInAdapter)
.orElseGet(()->CommandUtil.targetMemberNameFor(owningAction));
@@ -249,9 +267,9 @@ implements MemberExecutorService {
+ "which is an entity: {}", resultAdapter);
}
}
-
+
// ignore all other sorts of objects
-
+
}
private ManagedObject filteredIfRequired(
@@ -259,7 +277,7 @@ implements MemberExecutorService {
final ManagedObject resultAdapter,
final InteractionInitiatedBy interactionInitiatedBy) {
- if(ManagedObjects.isNullOrUnspecifiedOrEmpty(resultAdapter)) {
+ if(ManagedObjects.isNullOrUnspecifiedOrEmpty(resultAdapter)) {
return null;
}
@@ -273,9 +291,9 @@ implements MemberExecutorService {
if(result instanceof Collection || result.getClass().isArray()) {
val requiredContainerType = method.getReturnType();
-
+
val autofittedObjectContainer = ManagedObjects.VisibilityUtil
- .visiblePojosAutofit(resultAdapter, interactionInitiatedBy, requiredContainerType);
+ .visiblePojosAutofit(resultAdapter, interactionInitiatedBy, requiredContainerType);
if (autofittedObjectContainer != null) {
return getObjectManager().adapt(autofittedObjectContainer);
@@ -293,5 +311,5 @@ implements MemberExecutorService {
}
-
+
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/AppConfiguration.java b/examples/demo/domain/src/main/java/demoapp/dom/AppConfiguration.java
index 10b4af3..5607290 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/AppConfiguration.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/AppConfiguration.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
+ *
+ * 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 demoapp.dom;
import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/ui/custom/geocoding/GeoapifyClient.java b/examples/demo/domain/src/main/java/demoapp/dom/ui/custom/geocoding/GeoapifyClient.java
index f299695..edb0bc0 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/ui/custom/geocoding/GeoapifyClient.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/ui/custom/geocoding/GeoapifyClient.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
+ *
+ * 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 demoapp.dom.ui.custom.geocoding;
import java.io.IOException;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/ui/custom/latlng/LatLng.java b/examples/demo/domain/src/main/java/demoapp/dom/ui/custom/latlng/LatLng.java
index 5fedcf4..972dd2b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/ui/custom/latlng/LatLng.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/ui/custom/latlng/LatLng.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
+ *
+ * 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 demoapp.dom.ui.custom.latlng;
import lombok.Data;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/ui/custom/latlng/LatLngUtils.java b/examples/demo/domain/src/main/java/demoapp/dom/ui/custom/latlng/LatLngUtils.java
index d3196d6..b9fab61 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/ui/custom/latlng/LatLngUtils.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/ui/custom/latlng/LatLngUtils.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
+ *
+ * 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 demoapp.dom.ui.custom.latlng;
import java.math.BigDecimal;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/ui/custom/latlng/Latitude.java b/examples/demo/domain/src/main/java/demoapp/dom/ui/custom/latlng/Latitude.java
index 5d6a657..577dbee 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/ui/custom/latlng/Latitude.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/ui/custom/latlng/Latitude.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
+ *
+ * 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 demoapp.dom.ui.custom.latlng;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/ui/custom/latlng/Longitude.java b/examples/demo/domain/src/main/java/demoapp/dom/ui/custom/latlng/Longitude.java
index d6cbe17..b7191d5 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/ui/custom/latlng/Longitude.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/ui/custom/latlng/Longitude.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
+ *
+ * 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 demoapp.dom.ui.custom.latlng;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/ui/custom/latlng/Zoom.java b/examples/demo/domain/src/main/java/demoapp/dom/ui/custom/latlng/Zoom.java
index 17a8c48..a9ef07a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/ui/custom/latlng/Zoom.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/ui/custom/latlng/Zoom.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
+ *
+ * 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 demoapp.dom.ui.custom.latlng;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/ui/custom/vm/BoundingBox.java b/examples/demo/domain/src/main/java/demoapp/dom/ui/custom/vm/BoundingBox.java
index 11f66b9..1c74e72 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/ui/custom/vm/BoundingBox.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/ui/custom/vm/BoundingBox.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
+ *
+ * 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 demoapp.dom.ui.custom.vm;
import lombok.Data;
diff --git a/examples/demo/domain/src/test/java/demoapp/dom/ui/custom/geocoding/GeoapifyClientTest_geocode.java b/examples/demo/domain/src/test/java/demoapp/dom/ui/custom/geocoding/GeoapifyClientTest_geocode.java
index 70fc07b..7baebbf 100644
--- a/examples/demo/domain/src/test/java/demoapp/dom/ui/custom/geocoding/GeoapifyClientTest_geocode.java
+++ b/examples/demo/domain/src/test/java/demoapp/dom/ui/custom/geocoding/GeoapifyClientTest_geocode.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
+ *
+ * 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 demoapp.dom.ui.custom.geocoding;
import org.assertj.core.api.SoftAssertions;
diff --git a/examples/demo/wicket/src/main/java/demoapp/webapp/wicket/ui/custom/WhereInTheWorldPanelFactory.java b/examples/demo/wicket/src/main/java/demoapp/webapp/wicket/ui/custom/WhereInTheWorldPanelFactory.java
index da6a1c0..0a91dd8 100644
--- a/examples/demo/wicket/src/main/java/demoapp/webapp/wicket/ui/custom/WhereInTheWorldPanelFactory.java
+++ b/examples/demo/wicket/src/main/java/demoapp/webapp/wicket/ui/custom/WhereInTheWorldPanelFactory.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
+ *
+ * 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 demoapp.webapp.wicket.ui.custom;
import javax.inject.Inject;
diff --git a/incubator/clients/kroviz/adoc/modules/kroviz/partials/design/dev-mindmap.adoc b/incubator/clients/kroviz/adoc/modules/kroviz/partials/design/dev-mindmap.adoc
index b9a7839..ffcf242 100644
--- a/incubator/clients/kroviz/adoc/modules/kroviz/partials/design/dev-mindmap.adoc
+++ b/incubator/clients/kroviz/adoc/modules/kroviz/partials/design/dev-mindmap.adoc
@@ -1,3 +1,6 @@
+:Notice: 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 ag [...]
+
+
.Development MindMap
[plantuml]
----
@@ -55,4 +58,4 @@
@endmindmap
~~--
-----
\ No newline at end of file
+----
diff --git a/incubator/pom.xml b/incubator/pom.xml
index 93d40d8..be8b0dc 100644
--- a/incubator/pom.xml
+++ b/incubator/pom.xml
@@ -61,7 +61,7 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
-
+
<!-- APACHE ISIS customisation 4/7: start -->
<configuration>
<addDefaultLicenseMatchers>true</addDefaultLicenseMatchers>
diff --git a/isis-parent/pom.xml b/isis-parent/pom.xml
index e9b472c..608fceb 100644
--- a/isis-parent/pom.xml
+++ b/isis-parent/pom.xml
@@ -742,14 +742,14 @@ under the License.
<goal>process</goal>
</goals>
<configuration>
-
+
<!-- Reference the supplemental-model artifact from module supplemental-model -->
<supplementalModelArtifacts>
<supplementalModelArtifact>org.apache.isis:supplemental-model:1.0</supplementalModelArtifact>
</supplementalModelArtifacts>
-
+
<runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
-
+
<!-- Specify the path, relative to the JAR root, where the supplemental model file is located -->
<supplementalModels>
<supplementalModel>supplemental-models.xml</supplementalModel>
@@ -777,7 +777,7 @@ under the License.
</execution>
</executions>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
@@ -996,7 +996,7 @@ under the License.
<!-- END SNIPPET: release-profile -->
<!-- APACHE ISIS customisation 7/7: start -->
-
+
<profile>
<id>released</id>
<activation>
@@ -1015,7 +1015,7 @@ under the License.
<module>../valuetypes</module>
</modules>
</profile>
-
+
<!-- APACHE ISIS customisation 7/7: end -->
</profiles>
diff --git a/persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/facets/prop/column/MandatoryFacetDerivedFromJpaColumn.java b/persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/facets/prop/column/MandatoryFacetDerivedFromJpaColumn.java
index 4529614..0f4c4af 100644
--- a/persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/facets/prop/column/MandatoryFacetDerivedFromJpaColumn.java
+++ b/persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/facets/prop/column/MandatoryFacetDerivedFromJpaColumn.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
+ *
+ * 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.isis.persistence.jpa.metamodel.facets.prop.column;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -14,4 +32,4 @@ public class MandatoryFacetDerivedFromJpaColumn extends MandatoryFacetAbstract {
}
-}
\ No newline at end of file
+}
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/springdata/EmployeeManager_deleteEmployee.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/springdata/EmployeeManager_deleteEmployee.java
index c851c2e..9e74f7e 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/springdata/EmployeeManager_deleteEmployee.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/springdata/EmployeeManager_deleteEmployee.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
+ *
+ * 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.isis.testdomain.jpa.springdata;
import java.util.List;
@@ -13,12 +31,12 @@ import lombok.RequiredArgsConstructor;
public class EmployeeManager_deleteEmployee {
@Inject private EmployeeRepository employeeRepo;
-
+
private final EmployeeManager holder;
-
+
public EmployeeManager act(List<Employee> employeesToRemove) {
employeesToRemove.forEach(employeeRepo::delete);
return holder;
}
-
+
}