You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/02/05 18:58:29 UTC
[isis] branch v1-lab updated: fixes build of metamodel and runtime
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v1-lab
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/v1-lab by this push:
new 1415fe6 fixes build of metamodel and runtime
1415fe6 is described below
commit 1415fe6b4c51458d511e5e8bb742554fbd441556
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Feb 5 19:58:02 2021 +0100
fixes build of metamodel and runtime
also removes uses of common-cli options
---
.../facets/object/parseable/ParserUtil.java | 4 +-
.../value/vsp/ValueSemanticsProviderUtil.java | 4 +-
...ionParameterAbstractTest_getId_and_getName.java | 9 +-
core/pom.xml | 2 +-
.../opts/OptionHandlerAdditionalProperty.java | 6 +-
.../runner/opts/OptionHandlerAppManifest.java | 12 +-
.../runner/opts/OptionHandlerConfiguration.java | 4 +-
.../runner/opts/OptionHandlerDeploymentType.java | 4 +-
.../runtime/runner/opts/OptionHandlerFixture.java | 12 +-
.../runtime/runner/opts/OptionHandlerPassword.java | 4 +-
.../runtime/runner/opts/OptionHandlerUser.java | 4 +-
pom.xml | 157 ++++++++++-----------
12 files changed, 110 insertions(+), 112 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParserUtil.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParserUtil.java
index 3f70174..0fa89e8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParserUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParserUtil.java
@@ -43,7 +43,9 @@ public final class ParserUtil {
public static Class<? extends Parser<?>> parserOrNull(final Class<?> candidateClass, final String classCandidateName) {
@SuppressWarnings("rawtypes")
final Class type = candidateClass != null ? ClassUtil.implementingClassOrNull(candidateClass.getName(), Parser.class, FacetHolder.class) : null;
- return type != null ? type : ClassUtil.implementingClassOrNull(classCandidateName, Parser.class, FacetHolder.class);
+ return type != null
+ ? type
+ : (Class) ClassUtil.implementingClassOrNull(classCandidateName, Parser.class, FacetHolder.class);
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderUtil.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderUtil.java
index f93ebe1..27d5b8f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderUtil.java
@@ -45,7 +45,9 @@ public final class ValueSemanticsProviderUtil {
public static Class<? extends ValueSemanticsProvider<?>> valueSemanticsProviderOrNull(final Class<?> candidateClass, final String classCandidateName) {
@SuppressWarnings("rawtypes")
final Class clazz = candidateClass != null ? ClassUtil.implementingClassOrNull(candidateClass.getName(), ValueSemanticsProvider.class, FacetHolder.class) : null;
- return clazz != null ? clazz : ClassUtil.implementingClassOrNull(classCandidateName, ValueSemanticsProvider.class, FacetHolder.class);
+ return clazz != null
+ ? clazz
+ : (Class) ClassUtil.implementingClassOrNull(classCandidateName, ValueSemanticsProvider.class, FacetHolder.class);
}
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
index 3985ca0..f918f86 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
@@ -41,6 +41,7 @@ import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+
public class ObjectActionParameterAbstractTest_getId_and_getName {
@Rule
@@ -164,7 +165,7 @@ public class ObjectActionParameterAbstractTest_getId_and_getName {
one(actionParamPeer).getFacet(NamedFacet.class);
will(returnValue(null));
- one(parentAction).getParameters((Filter<ObjectActionParameter>) with(anything()));
+ one(parentAction).getParameters(with(Expectations.<Filter<ObjectActionParameter>>anything()));
will(returnValue(Lists.newArrayList(objectActionParameter)));
}
});
@@ -181,9 +182,9 @@ public class ObjectActionParameterAbstractTest_getId_and_getName {
context.checking(new Expectations() {
{
one(actionParamPeer).getFacet(NamedFacet.class);
- will(returnValue(null));
+ will(returnValue(null));
- one(parentAction).getParameters((Filter<ObjectActionParameter>) with(anything()));
+ one(parentAction).getParameters(with(Expectations.<Filter<ObjectActionParameter>>anything()));
will(returnValue(Lists.newArrayList(stubObjectActionParameterString, objectActionParameter, stubObjectActionParameterString2)));
}
});
@@ -202,7 +203,7 @@ public class ObjectActionParameterAbstractTest_getId_and_getName {
one(actionParamPeer).getFacet(NamedFacet.class);
will(returnValue(null));
- one(parentAction).getParameters((Filter<ObjectActionParameter>) with(anything()));
+ one(parentAction).getParameters(with(Expectations.<Filter<ObjectActionParameter>>anything()));
will(returnValue(Lists.newArrayList(stubObjectActionParameterString, objectActionParameter, stubObjectActionParameterString2)));
}
});
diff --git a/core/pom.xml b/core/pom.xml
index a26a05d..e4cd1a3 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -119,7 +119,7 @@
<reflections.version>0.9.10</reflections.version>
<commons-logging.version>1.2</commons-logging.version>
- <commons-cli.version>1.3.1</commons-cli.version>
+ <commons-cli.version>1.4</commons-cli.version>
<commons-httpclient.version>3.1</commons-httpclient.version>
<commons-codec.version>1.10</commons-codec.version>
<commons-email.version>1.4</commons-email.version>
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerAdditionalProperty.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerAdditionalProperty.java
index 7310746..6d1c74d 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerAdditionalProperty.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerAdditionalProperty.java
@@ -40,9 +40,9 @@ public class OptionHandlerAdditionalProperty extends OptionHandlerAbstract {
@Override
@SuppressWarnings("static-access")
public void addOption(final Options options) {
- final Option option = OptionBuilder.withArgName("property=value").hasArg().withValueSeparator().withDescription("use value for given property").create(ADDITIONAL_PROPERTY);
- option.setArgs(Option.UNLIMITED_VALUES);
- options.addOption(option);
+// final Option option = OptionBuilder.withArgName("property=value").hasArg().withValueSeparator().withDescription("use value for given property").create(ADDITIONAL_PROPERTY);
+// option.setArgs(Option.UNLIMITED_VALUES);
+// options.addOption(option);
}
@Override
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerAppManifest.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerAppManifest.java
index ac13c14..10018c8 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerAppManifest.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerAppManifest.java
@@ -47,12 +47,12 @@ public class OptionHandlerAppManifest extends OptionHandlerAbstract {
@Override
@SuppressWarnings("static-access")
public void addOption(final Options options) {
- final Option option = OptionBuilder
- .withArgName("app manifest").hasArg()
- .withLongOpt(APP_MANIFEST_LONG_OPT)
- .withDescription("fully qualified AppManifest class")
- .create(APP_MANIFEST_OPT);
- options.addOption(option);
+// final Option option = OptionBuilder
+// .withArgName("app manifest").hasArg()
+// .withLongOpt(APP_MANIFEST_LONG_OPT)
+// .withDescription("fully qualified AppManifest class")
+// .create(APP_MANIFEST_OPT);
+ //options.addOption(option);
}
@Override
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerConfiguration.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerConfiguration.java
index 76350af..c120232 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerConfiguration.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerConfiguration.java
@@ -41,8 +41,8 @@ public class OptionHandlerConfiguration extends OptionHandlerAbstract {
@Override
@SuppressWarnings("static-access")
public void addOption(final Options options) {
- final Option option = OptionBuilder.withArgName("config file").hasArg().withLongOpt(CONFIGURATION_LONG_OPT).withDescription("read in configuration file (as well as isis.properties)").create(CONFIGURATION_OPT);
- options.addOption(option);
+// final Option option = OptionBuilder.withArgName("config file").hasArg().withLongOpt(CONFIGURATION_LONG_OPT).withDescription("read in configuration file (as well as isis.properties)").create(CONFIGURATION_OPT);
+// options.addOption(option);
}
@Override
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerDeploymentType.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerDeploymentType.java
index 31b2a15..3eee044 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerDeploymentType.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerDeploymentType.java
@@ -51,8 +51,8 @@ public abstract class OptionHandlerDeploymentType extends OptionHandlerAbstract
@Override
@SuppressWarnings("static-access")
public void addOption(final Options options) {
- final Option option = OptionBuilder.withArgName("name").hasArg().withLongOpt(TYPE_LONG_OPT).withDescription("deployment type: " + types).create(TYPE_OPT);
- options.addOption(option);
+// final Option option = OptionBuilder.withArgName("name").hasArg().withLongOpt(TYPE_LONG_OPT).withDescription("deployment type: " + types).create(TYPE_OPT);
+// options.addOption(option);
}
@Override
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerFixture.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerFixture.java
index dce88c1..8c56db2 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerFixture.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerFixture.java
@@ -42,12 +42,12 @@ public class OptionHandlerFixture extends OptionHandlerFixtureAbstract {
@Override
@SuppressWarnings("static-access")
public void addOption(final Options options) {
- final Option option = OptionBuilder
- .withArgName("class name").hasArg()
- .withLongOpt(FIXTURE_LONG_OPT)
- .withDescription("fully qualified fixture class")
- .create(FIXTURE_OPT);
- options.addOption(option);
+// final Option option = OptionBuilder
+// .withArgName("class name").hasArg()
+// .withLongOpt(FIXTURE_LONG_OPT)
+// .withDescription("fully qualified fixture class")
+// .create(FIXTURE_OPT);
+// options.addOption(option);
}
@Override
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerPassword.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerPassword.java
index 10a43a2..83283bb 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerPassword.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerPassword.java
@@ -44,8 +44,8 @@ public class OptionHandlerPassword extends OptionHandlerAbstract {
@Override
@SuppressWarnings("static-access")
public void addOption(final Options options) {
- final Option option = OptionBuilder.withArgName("password").hasArg().withLongOpt(PASSWORD_LONG_OPT).withDescription("password to automatically log in with").create(PASSWORD_OPT);
- options.addOption(option);
+// final Option option = OptionBuilder.withArgName("password").hasArg().withLongOpt(PASSWORD_LONG_OPT).withDescription("password to automatically log in with").create(PASSWORD_OPT);
+// options.addOption(option);
}
@Override
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerUser.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerUser.java
index a6ccdcb..3317075 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerUser.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerUser.java
@@ -44,8 +44,8 @@ public class OptionHandlerUser extends OptionHandlerAbstract {
@Override
@SuppressWarnings("static-access")
public void addOption(final Options options) {
- final Option option = OptionBuilder.withArgName("user name").hasArg().withLongOpt(USER_LONG_OPT).withDescription("user name to log in with").create(USER_OPT);
- options.addOption(option);
+// final Option option = OptionBuilder.withArgName("user name").hasArg().withLongOpt(USER_LONG_OPT).withDescription("user name to log in with").create(USER_OPT);
+// options.addOption(option);
}
diff --git a/pom.xml b/pom.xml
index eae120a..3d38ccd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,96 +1,89 @@
<?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 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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<!-- 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"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.isis</groupId>
- <artifactId>isis-all</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <groupId>org.apache.isis</groupId>
+ <artifactId>isis-all</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
- <packaging>pom</packaging>
+ <packaging>pom</packaging>
- <name>Apache Isis (Aggregator)</name>
- <description>
+ <name>Apache Isis (Aggregator)</name>
+ <description>
Convenience aggregator POM that references all modules.
The parent POM of all modules is core/pom.xml
</description>
- <scm>
- <connection>scm:git:https://github.com/apache/isis.git</connection>
- <developerConnection>scm:git:https://github.com/apache/isis.git</developerConnection>
- <url>https://github.com/apache/isis.git</url>
- <tag>HEAD</tag>
- </scm>
+ <scm>
+ <connection>scm:git:https://github.com/apache/isis.git</connection>
+ <developerConnection>scm:git:https://github.com/apache/isis.git</developerConnection>
+ <url>https://github.com/apache/isis.git</url>
+ <tag>HEAD</tag>
+ </scm>
-
- <profiles>
- <profile>
- <id>core</id>
- <activation>
- <property>
- <name>!skip.core</name>
- </property>
- </activation>
- <modules>
- <module>core</module>
- </modules>
- </profile>
- <profile>
- <id>app</id>
- <activation>
- <property>
- <name>!skip.app</name>
- </property>
- </activation>
- <modules>
- <module>example/application/helloworld</module>
- <module>example/application/simpleapp</module>
- </modules>
- </profile>
+ <profiles>
+ <profile>
+ <id>core</id>
+ <activation>
+ <property>
+ <name>!skip.core</name>
+ </property>
+ </activation>
+ <modules>
+ <module>core</module>
+ </modules>
+ </profile>
- <profile>
- <id>arch</id>
- <activation>
- <property>
- <name>arch</name>
- </property>
- </activation>
- <modules>
- <!--
- <module>example/archetype/helloworld</module>
- -->
- <module>example/archetype/simpleapp</module>
- </modules>
- </profile>
+ <profile>
+ <id>app</id>
+ <activation>
+ <property>
+ <name>!skip.app</name>
+ </property>
+ </activation>
+ <modules>
+ <module>example/application/helloworld</module>
+ <module>example/application/simpleapp</module>
+ </modules>
+ </profile>
- <profile>
- <id>docs</id>
- <activation>
- <property>
- <name>docs</name>
- </property>
- </activation>
- <modules>
- <module>adocs/documentation</module>
- </modules>
- </profile>
- </profiles>
+ <profile>
+ <id>arch</id>
+ <activation>
+ <property>
+ <name>arch</name>
+ </property>
+ </activation>
+ <modules>
+ <!-- <module>example/archetype/helloworld</module> -->
+ <module>example/archetype/simpleapp</module>
+ </modules>
+ </profile>
+
+ <profile>
+ <id>docs</id>
+ <activation>
+ <property>
+ <name>docs</name>
+ </property>
+ </activation>
+ <modules>
+ <module>adocs/documentation</module>
+ </modules>
+ </profile>
+ </profiles>
</project>