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 2014/10/19 13:05:59 UTC
[01/24] git commit: ISIS-872: bumping parent to org.apache:apache:15
Repository: isis
Updated Branches:
refs/heads/master b60eb22fa -> e8bd023ee
ISIS-872: bumping parent to org.apache:apache:15
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/6db40c59
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/6db40c59
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/6db40c59
Branch: refs/heads/master
Commit: 6db40c594a0efd3f6a4498a90cdc10c71326912f
Parents: 13eb200
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Oct 13 19:35:24 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Oct 13 19:35:24 2014 +0100
----------------------------------------------------------------------
core/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/6db40c59/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 3cc58bc..509a7bb 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>13</version>
+ <version>15</version>
<relativePath />
</parent>
[23/24] git commit: Merge branch 'prepare/isis-1.7.0-RC2'
Posted by da...@apache.org.
Merge branch 'prepare/isis-1.7.0-RC2'
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/70b77f25
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/70b77f25
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/70b77f25
Branch: refs/heads/master
Commit: 70b77f25c576b1c182adbaf464112470c0fc7aa1
Parents: 74821b8 c7b2ee8
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sun Oct 19 10:04:48 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sun Oct 19 10:04:48 2014 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
[13/24] ISIS-872: recreating todoapp archetype
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/admin/AdminContributions.java
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/admin/AdminContributions.java b/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/admin/AdminContributions.java
deleted file mode 100644
index 1267098..0000000
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/admin/AdminContributions.java
+++ /dev/null
@@ -1,110 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/**
- * 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 webapp.admin;
-
-import java.util.Collections;
-import java.util.List;
-
-import com.google.common.collect.Lists;
-
-import org.joda.time.LocalDate;
-
-import org.apache.isis.applib.AbstractService;
-import org.apache.isis.applib.ViewModel;
-import org.apache.isis.applib.annotation.*;
-import org.apache.isis.applib.annotation.ActionSemantics.Of;
-import org.apache.isis.applib.services.HasTransactionId;
-import org.apache.isis.applib.services.bookmark.Bookmark;
-import org.apache.isis.applib.services.bookmark.BookmarkService;
-import org.apache.isis.applib.services.clock.ClockService;
-import org.apache.isis.objectstore.jdo.applib.service.DomainChangeJdoAbstract;
-import org.apache.isis.objectstore.jdo.applib.service.audit.AuditEntryJdo;
-import org.apache.isis.objectstore.jdo.applib.service.audit.AuditingServiceJdoRepository;
-import org.apache.isis.objectstore.jdo.applib.service.command.CommandJdo;
-import org.apache.isis.objectstore.jdo.applib.service.command.CommandServiceJdoRepository;
-import org.apache.isis.objectstore.jdo.applib.service.publish.PublishedEventJdo;
-import org.apache.isis.objectstore.jdo.applib.service.publish.PublishingServiceJdoRepository;
-
-@DomainService
-public class AdminContributions extends AbstractService {
-
- /**
- * Depending on which services are available, returns either a list of {@link CommandJdo command}s that have
- * caused a change in the domain object or a list of {@link AuditEntryJdo audit entries} capturing the 'effect'
- * of that change.
- *
- * <p>
- * If {@link CommandJdo command}s are returned, then the corresponding {@link AuditEntryJdo audit entries} are
- * available from each command.
- */
- @NotInServiceMenu
- @ActionSemantics(Of.SAFE)
- @MemberOrder(sequence="30")
- public List<? extends DomainChangeJdoAbstract> recentChanges (
- final Object targetDomainObject,
- final @Optional @Named("From") LocalDate from,
- final @Optional @Named("To") LocalDate to) {
- final Bookmark targetBookmark = bookmarkService.bookmarkFor(targetDomainObject);
- final List<DomainChangeJdoAbstract> changes = Lists.newArrayList();
- if(commandServiceRepository != null) {
- changes.addAll(commandServiceRepository.findByTargetAndFromAndTo(targetBookmark, from, to));
- }
- if(publishingServiceRepository != null) {
- changes.addAll(publishingServiceRepository.findByTargetAndFromAndTo(targetBookmark, from, to));
- }
- changes.addAll(auditingServiceRepository.findByTargetAndFromAndTo(targetBookmark, from, to));
- Collections.sort(changes, DomainChangeJdoAbstract.compareByTimestampDescThenType());
- return changes;
- }
- /**
- * Hide for implementations of {@link HasTransactionId} (in other words for {@link CommandJdo command}s, {@link AuditEntryJdo audit entries}
- * and {@link PublishedEventJdo published event}s) and for {@link ViewModel}s.
- */
- public boolean hideRecentChanges(final Object targetDomainObject, final LocalDate from, final LocalDate to) {
- return targetDomainObject instanceof HasTransactionId || targetDomainObject instanceof ViewModel || auditingServiceRepository == null || bookmarkService == null;
- }
- public LocalDate default1RecentChanges() {
- return clockService.now().minusDays(7);
- }
- public LocalDate default2RecentChanges() {
- return clockService.now();
- }
-
-
- // //////////////////////////////////////
-
-
- @javax.inject.Inject
- private CommandServiceJdoRepository commandServiceRepository;
-
- @javax.inject.Inject
- private AuditingServiceJdoRepository auditingServiceRepository;
-
- @javax.inject.Inject
- private PublishingServiceJdoRepository publishingServiceRepository;
-
- @javax.inject.Inject
- private BookmarkService bookmarkService;
-
- @javax.inject.Inject
- private ClockService clockService;
-
-}
-
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/prototyping/DeveloperUtilities.java
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/prototyping/DeveloperUtilities.java b/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/prototyping/DeveloperUtilities.java
deleted file mode 100644
index a75ecdb..0000000
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/prototyping/DeveloperUtilities.java
+++ /dev/null
@@ -1,53 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/**
- * 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 webapp.prototyping;
-
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.value.Blob;
-import org.apache.isis.applib.value.Clob;
-import org.apache.isis.core.metamodel.services.devutils.DeveloperUtilitiesServiceDefault;
-
-/**
- * These overrides are simply to 'move' the action underneath the
- * 'Prototyping' menu.
- */
-@DomainService(menuOrder = "40.2")
-public class DeveloperUtilities extends DeveloperUtilitiesServiceDefault {
-
- @MemberOrder(name="Prototyping", sequence="90.1")
- @Override
- public Clob downloadMetaModel() {
- return super.downloadMetaModel();
- }
-
- @MemberOrder(name="Prototyping", sequence="90.2")
- @Override
- public Blob downloadLayouts() {
- return super.downloadLayouts();
- }
-
- @MemberOrder(name="Prototyping", sequence="90.3")
- @Override
- public void refreshServices() {
- super.refreshServices();
- }
-}
-
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/prototyping/ExternalLinksService.java
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/prototyping/ExternalLinksService.java b/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/prototyping/ExternalLinksService.java
index b947ec1..c3b6be3 100644
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/prototyping/ExternalLinksService.java
+++ b/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/prototyping/ExternalLinksService.java
@@ -30,7 +30,7 @@ public class ExternalLinksService {
public static enum ExternalLink {
ISIS_DOCUMENTATION("Apache Isis docs", "http://isis.apache.org/documentation.html"),
- PROJECT_ON_GITHUB("Project source code on Github", "https://github.com/apache/isis/tree/master/example/application/quickstart_wicket_restful_jdo/");
+ PROJECT_ON_GITHUB("Project source code on Github", "https://github.com/apache/isis/tree/master/example/application/${parentArtifactId}/");
private final String title;
private final String url;
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/scheduler/AbstractIsisQuartzJob.java
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/scheduler/AbstractIsisQuartzJob.java b/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/scheduler/AbstractIsisQuartzJob.java
deleted file mode 100644
index b9e1628..0000000
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/scheduler/AbstractIsisQuartzJob.java
+++ /dev/null
@@ -1,96 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/**
- * 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 webapp.scheduler;
-
-import com.google.common.base.Splitter;
-import com.google.common.collect.Iterables;
-
-import org.quartz.Job;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.runtime.authentication.standard.SimpleSession;
-import org.apache.isis.core.runtime.sessiontemplate.AbstractIsisSessionTemplate;
-import org.apache.isis.core.runtime.system.session.IsisSession;
-
-public class AbstractIsisQuartzJob implements Job {
-
- public static enum ConcurrentInstancesPolicy {
- /**
- * Only a single instance of this job is allowed to run.
- *
- * <p>
- * That is, if the job is invoked again before a previous instance has completed, then silently skips.
- */
- SINGLE_INSTANCE_ONLY,
- /**
- * Multiple instances of this job are allowed to run concurrently.
- *
- * <p>
- * That is, it is not required for the previous instance of this job to have completed before this one starts.
- */
- MULTIPLE_INSTANCES
- }
-
- private final AbstractIsisSessionTemplate isisRunnable;
-
- private final ConcurrentInstancesPolicy concurrentInstancesPolicy;
- private boolean executing;
-
- public AbstractIsisQuartzJob(AbstractIsisSessionTemplate isisRunnable) {
- this(isisRunnable, ConcurrentInstancesPolicy.SINGLE_INSTANCE_ONLY);
- }
- public AbstractIsisQuartzJob(AbstractIsisSessionTemplate isisRunnable, ConcurrentInstancesPolicy concurrentInstancesPolicy) {
- this.isisRunnable = isisRunnable;
- this.concurrentInstancesPolicy = concurrentInstancesPolicy;
- }
-
- // //////////////////////////////////////
-
- /**
- * Sets up an {@link IsisSession} then delegates to the {@link ${symbol_pound}doExecute(JobExecutionContext) hook}.
- */
- public void execute(final JobExecutionContext context) throws JobExecutionException {
- final AuthenticationSession authSession = newAuthSession(context);
- try {
- if(concurrentInstancesPolicy == ConcurrentInstancesPolicy.SINGLE_INSTANCE_ONLY && executing) {
- return;
- }
- executing = true;
-
- isisRunnable.execute(authSession, context);
- } finally {
- executing = false;
- }
- }
-
- AuthenticationSession newAuthSession(JobExecutionContext context) {
- String user = getKey(context, SchedulerConstants.USER_KEY);
- String rolesStr = getKey(context, SchedulerConstants.ROLES_KEY);
- String[] roles = Iterables.toArray(
- Splitter.on(",").split(rolesStr), String.class);
- return new SimpleSession(user, roles);
- }
-
- String getKey(JobExecutionContext context, String key) {
- return context.getMergedJobDataMap().getString(key);
- }
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/scheduler/BackgroundCommandExecutionQuartzJob.java
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/scheduler/BackgroundCommandExecutionQuartzJob.java b/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/scheduler/BackgroundCommandExecutionQuartzJob.java
deleted file mode 100644
index 0d0cf9e..0000000
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/scheduler/BackgroundCommandExecutionQuartzJob.java
+++ /dev/null
@@ -1,31 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/**
- * 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 webapp.scheduler;
-
-import org.apache.isis.objectstore.jdo.service.BackgroundCommandExecutionFromBackgroundCommandServiceJdo;
-
-
-public class BackgroundCommandExecutionQuartzJob extends AbstractIsisQuartzJob {
-
- public BackgroundCommandExecutionQuartzJob() {
- super(new BackgroundCommandExecutionFromBackgroundCommandServiceJdo());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/scheduler/SchedulerConstants.java
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/scheduler/SchedulerConstants.java b/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/scheduler/SchedulerConstants.java
deleted file mode 100644
index f662fe5..0000000
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/scheduler/SchedulerConstants.java
+++ /dev/null
@@ -1,30 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/**
- * 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 webapp.scheduler;
-
-
-public final class SchedulerConstants {
-
- private SchedulerConstants(){}
-
- public static final String USER_KEY = SchedulerConstants.class.getPackage().getName() + ".user";
- public static final String ROLES_KEY = SchedulerConstants.class.getPackage().getName() + ".roles";
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/resources/webapp/realm1.ini
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/resources/webapp/realm1.ini b/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/resources/webapp/realm1.ini
index 311694b..1473390 100644
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/resources/webapp/realm1.ini
+++ b/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/resources/webapp/realm1.ini
@@ -33,8 +33,10 @@
#
sven = pass, admin_role
-dick = pass, user_role, analysis_role, self-install_role
-bob = pass, user_role, self-install_role
+dick = pass, readwrite_role, dashboard_role, analysis_role, self-install_role
+bob = pass, readwrite_role, dashboard_role, self-install_role
+joe = pass, readwrite_role, self-install_role, noDueBy_role
+guest = guest, readonly_role
@@ -62,22 +64,31 @@ bob = pass, user_role, self-install_role
# perm in format: packageName:className:memberName:r,w
#
-# the role/perm mappings for realm1 and realm2 are "coincidentally" the same.
-# But if using the IsisLdapRealm, it could be pointed at an ini file such as this in
+# If using the IsisLdapRealm, it could be pointed at an ini file such as this in
# order to share role/perm mappings.
#
# configuring iniRealm to use Shiro's built-in WildcardPermissions
-user_role = *:ToDoItems:*:*,\
- *:ToDoItem:*:*,\
- *:ToDoAppDashboard:*:*
+
+readwrite_role = *:ToDoItems:*:*,\
+ *:ToDoItem:*:*
+
+readonly_role = *:ToDoItems:notYetComplete:*,\
+ *:ToDoItems:complete:*,\
+ *:ToDoItems:allToDos:*,\
+ *:ToDoItem:*:r
+
+dashboard_role = *:ToDoAppDashboardService:*:*,\
+ *:ToDoAppDashboard:*:*
+
analysis_role = *:ToDoItemAnalysis:*:*,\
*:ToDoItemsByCategoryViewModel:*:*,\
*:ToDoItemsByDateRangeViewModel:*:*
-self-install_role = *:ToDoItemsFixturesService:installFixtures:*
-admin_role = *
+self-install_role = *:ToDoItemsFixturesService:*:*
+
+admin_role = *
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/resources/webapp/realm2.ini
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/resources/webapp/realm2.ini b/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/resources/webapp/realm2.ini
deleted file mode 100644
index fd0ee8f..0000000
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/resources/webapp/realm2.ini
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# 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.
-#
-
-
-# -----------------------------------------------------------------------------
-# Users and their assigned roles
-#
-# Each line conforms to the format defined in the
-# org.apache.shiro.realm.text.TextConfigurationRealm#setUserDefinitions JavaDoc
-# -----------------------------------------------------------------------------
-
-[users]
-# user = password, role1, role2, role3, ...
-
-#
-# realm2 configures joe and guest only. Additional logins are configured in realm1
-#
-
-joe = pass, user_role, self-install_role
-guest = guest, user_role
-
-
-
-# -----------------------------------------------------------------------------
-# Roles with assigned permissions
-#
-# Each line conforms to the format defined in the
-# org.apache.shiro.realm.text.TextConfigurationRealm#setRoleDefinitions JavaDoc
-# -----------------------------------------------------------------------------
-
-[roles]
-# role = perm1, perm2, perm3, ...
-# perm in format: packageName:className:memberName:r,w
-
-#
-# the role/perm mappings for realm1 and realm2 are "coincidentally" the same.
-# But if using the IsisLdapRealm, it could be pointed at an ini file such as this in
-# order to share role/perm mappings.
-#
-
-# configuring iniRealm to use Shiro's built-in WildcardPermissions
-user_role = *:ToDoItems:*:*,\
- *:ToDoItem:*:*,\
- *:ToDoAppDashboard:*:*
-analysis_role = *:ToDoItemAnalysis:*:*,\
- *:ToDoItemsByCategoryViewModel:*:*,\
- *:ToDoItemsByDateRangeViewModel:*:*
-self-install_role = *:ToDoItemsFixturesService:installFixtures:*
-admin_role = *
-
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/resources/webapp/scheduler/quartz-config.xml
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/resources/webapp/scheduler/quartz-config.xml b/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/resources/webapp/scheduler/quartz-config.xml
deleted file mode 100644
index c8ee858..0000000
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/resources/webapp/scheduler/quartz-config.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-<?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.
--->
-<job-scheduling-data
- xmlns="http://www.quartz-scheduler.org/xml/JobSchedulingData"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.quartz-scheduler.org/xml/JobSchedulingData
-http://www.quartz-scheduler.org/xml/job_scheduling_data_1_8.xsd"
- version="1.8">
-
- <schedule>
- <job>
- <name>BackgroundCommandExecutionJob</name>
- <group>Isis</group>
- <description>Poll and execute any background actions persisted by the BackgroundActionServiceJdo domain service</description>
- <job-class>webapp.scheduler.BackgroundCommandExecutionQuartzJob</job-class>
- <job-data-map>
- <entry>
- <key>webapp.scheduler.user</key>
- <value>scheduler_user</value>
- </entry>
- <entry>
- <key>webapp.scheduler.roles</key>
- <value>admin_role</value>
- </entry>
- </job-data-map>
- </job>
-
- <!--
- cron format:
- http://quartz-scheduler.org/documentation/quartz-2.x/tutorials/tutorial-lesson-06
- -->
- <trigger>
- <cron>
- <name>BackgroundCommandExecutionJobEveryTenSeconds</name>
- <job-name>BackgroundCommandExecutionJob</job-name>
- <job-group>Isis</job-group>
- <!--
- <cron-expression>0 1 * * * ?</cron-expression>
- -->
- <cron-expression>0/10 * * * * ?</cron-expression>
- </cron>
- </trigger>
-
- </schedule>
-</job-scheduling-data>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/resources/webapp/scheduler/quartz.properties
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/resources/webapp/scheduler/quartz.properties b/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/resources/webapp/scheduler/quartz.properties
deleted file mode 100644
index 79ad145..0000000
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/resources/webapp/scheduler/quartz.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-${symbol_pound}
-${symbol_pound} Licensed to the Apache Software Foundation (ASF) under one
-${symbol_pound} or more contributor license agreements. See the NOTICE file
-${symbol_pound} distributed with this work for additional information
-${symbol_pound} regarding copyright ownership. The ASF licenses this file
-${symbol_pound} to you under the Apache License, Version 2.0 (the
-${symbol_pound} "License"); you may not use this file except in compliance
-${symbol_pound} with the License. You may obtain a copy of the License at
-${symbol_pound}
-${symbol_pound} http://www.apache.org/licenses/LICENSE-2.0
-${symbol_pound}
-${symbol_pound} Unless required by applicable law or agreed to in writing,
-${symbol_pound} software distributed under the License is distributed on an
-${symbol_pound} "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-${symbol_pound} KIND, either express or implied. See the License for the
-${symbol_pound} specific language governing permissions and limitations
-${symbol_pound} under the License.
-${symbol_pound}
-
-org.quartz.scheduler.instanceName = SchedulerQuartzConfigXml
-org.quartz.threadPool.threadCount = 1
-org.quartz.jobStore.class = org.quartz.simpl.RAMJobStore
-org.quartz.plugin.jobInitializer.class =org.quartz.plugins.xml.XMLSchedulingDataProcessorPlugin
-org.quartz.plugin.jobInitializer.fileNames = webapp/scheduler/quartz-config.xml
-org.quartz.plugin.jobInitializer.failOnFileNotFound = true
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/authentication_file.passwords
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/authentication_file.passwords b/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/authentication_file.passwords
deleted file mode 100644
index 9a568b0..0000000
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/authentication_file.passwords
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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.
-
-
-#
-# configuration file for the file-based authentication
-# not used by the onlinedemo
-#
-
-# list of users, and their password, and optionally roles
-sven:pass:org.apache.isis.viewer.wicket.roles.USER
-dick:pass:org.apache.isis.viewer.wicket.roles.USER
-bob:pass:org.apache.isis.viewer.wicket.roles.USER
-joe:pass:org.apache.isis.viewer.wicket.roles.USER
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/authentication_file.properties
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/authentication_file.properties b/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/authentication_file.properties
deleted file mode 100644
index 8edf17c..0000000
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/authentication_file.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-${symbol_pound} Licensed to the Apache Software Foundation (ASF) under one
-${symbol_pound} or more contributor license agreements. See the NOTICE file
-${symbol_pound} distributed with this work for additional information
-${symbol_pound} regarding copyright ownership. The ASF licenses this file
-${symbol_pound} to you under the Apache License, Version 2.0 (the
-${symbol_pound} "License"); you may not use this file except in compliance
-${symbol_pound} with the License. You may obtain a copy of the License at
-${symbol_pound}
-${symbol_pound} http://www.apache.org/licenses/LICENSE-2.0
-${symbol_pound}
-${symbol_pound} Unless required by applicable law or agreed to in writing,
-${symbol_pound} software distributed under the License is distributed on an
-${symbol_pound} "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-${symbol_pound} KIND, either express or implied. See the License for the
-${symbol_pound} specific language governing permissions and limitations
-${symbol_pound} under the License.
-
-${symbol_pound}
-${symbol_pound} configuration file for the File-based authentication mechanism
-${symbol_pound}
-
-
-${symbol_pound}
-${symbol_pound} (intentionally empty)
-${symbol_pound}
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/authorization_file.allow
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/authorization_file.allow b/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/authorization_file.allow
deleted file mode 100644
index 4407ec2..0000000
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/authorization_file.allow
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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.
-
-
-#
-# configuration file for the file-based authorization
-#
-
-
-#
-# (intentionally empty)
-#
-
-
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/authorization_file.properties
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/authorization_file.properties b/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/authorization_file.properties
deleted file mode 100644
index 7baee9c..0000000
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/authorization_file.properties
+++ /dev/null
@@ -1,50 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-${symbol_pound} Licensed to the Apache Software Foundation (ASF) under one
-${symbol_pound} or more contributor license agreements. See the NOTICE file
-${symbol_pound} distributed with this work for additional information
-${symbol_pound} regarding copyright ownership. The ASF licenses this file
-${symbol_pound} to you under the Apache License, Version 2.0 (the
-${symbol_pound} "License"); you may not use this file except in compliance
-${symbol_pound} with the License. You may obtain a copy of the License at
-${symbol_pound}
-${symbol_pound} http://www.apache.org/licenses/LICENSE-2.0
-${symbol_pound}
-${symbol_pound} Unless required by applicable law or agreed to in writing,
-${symbol_pound} software distributed under the License is distributed on an
-${symbol_pound} "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-${symbol_pound} KIND, either express or implied. See the License for the
-${symbol_pound} specific language governing permissions and limitations
-${symbol_pound} under the License.
-
-${symbol_pound}
-${symbol_pound} configuration file for the File-based authorization mechanism
-${symbol_pound}
-
-
-${symbol_pound}
-${symbol_pound} the whitelist file
-${symbol_pound} (value shown below is the default)
-${symbol_pound}
-
-${symbol_pound}isis.authorization.file.whitelist=authorization_file.allow
-
-
-
-${symbol_pound}
-${symbol_pound} the blacklist file
-${symbol_pound} (there is no default value; provide a filename)
-${symbol_pound}
-
-${symbol_pound}isis.authorization.file.blacklist=
-
-
-
-${symbol_pound}
-${symbol_pound} switch on "learning mode". In this mode the authorization mechanism
-${symbol_pound} will grant all requests, and log those requests into the allow file.
-${symbol_pound}
-
-${symbol_pound}isis.authorization.learn=true
-
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties b/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties
index e6c49a1..6961bb1 100644
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties
+++ b/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties
@@ -53,41 +53,22 @@ isis.persistor=datanucleus
-
${symbol_pound}
${symbol_pound} configure authentication mechanism to use (to logon to the system)
-${symbol_pound} note:
-${symbol_pound} - authentication is disabled if running in exploration mode
-${symbol_pound} - the Scimpi viewer allows access to anonymous users
-${symbol_pound}
+${symbol_pound}
-${symbol_pound} default is file in SERVER mode, none in SERVER_EXPLORATION. Derived from wicket mode
${symbol_pound}isis.authentication=bypass
isis.authentication=shiro
+
${symbol_pound}
${symbol_pound} configure authorization mechanism to use
${symbol_pound}
-${symbol_pound} The authorization mechanism define each users' permissions to view/edit object properties
-${symbol_pound} or collections, and to view/invoke object actions
-${symbol_pound}
-${symbol_pound} configuring this component automatically refines the metamodel (installing a facet factory
-${symbol_pound} which vetoes access as required)
-${symbol_pound}
-${symbol_pound} default is file in SERVER mode, none in SERVER_EXPLORATION. Derived from wicket mode
-${symbol_pound}isis.authorization=file
+${symbol_pound}isis.authorization=bypass
isis.authorization=shiro
-${symbol_pound}
-${symbol_pound} configure the user profile store to use.
-${symbol_pound}
-${symbol_pound} the user profile store is supported by some viewers (though not the Wicket or
-${symbol_pound} Restful viewers) as a way to store user-specific settings (eg colours, themes etc)
-${symbol_pound}
-isis.user-profile-store=in-memory
-
@@ -164,31 +145,14 @@ isis.services.ServicesInstallerFromAnnotation.packagePrefix=app,${symbol_escape}
webapp.admin,${symbol_escape}
webapp.prototyping
-${symbol_pound}isis.services.prefix =
isis.services = ${symbol_escape}
org.apache.isis.applib.services.bookmark.BookmarkHolderActionContributions,${symbol_escape}
${symbol_escape}
${symbol_pound} customizable exception handling, ${symbol_escape}
org.apache.isis.objectstore.jdo.applib.service.exceprecog.ExceptionRecognizerCompositeForJdoObjectStore,${symbol_escape}
- ${symbol_escape}
- ${symbol_pound} isis-module-command-jdo services, ${symbol_escape}
- org.apache.isis.objectstore.jdo.applib.service.command.CommandServiceJdoContributions,${symbol_escape}
- org.apache.isis.objectstore.jdo.applib.service.background.BackgroundCommandServiceJdoContributions,${symbol_escape}
- ${symbol_escape}
- ${symbol_pound} isis-module-audit-jdo services, ${symbol_escape}
- org.apache.isis.objectstore.jdo.applib.service.audit.AuditingServiceJdoContributions,${symbol_escape}
- ${symbol_escape}
- ${symbol_pound} isis-module-publishing-jdo services, ${symbol_escape}
- org.apache.isis.objectstore.jdo.applib.service.publish.PublishingServiceJdoContributions,${symbol_escape}
- ${symbol_escape}
- ${symbol_pound} JDO implementation of the two SettingsServices, ${symbol_escape}
- ${symbol_pound} org.apache.isis.objectstore.jdo.applib.service.settings.ApplicationSettingsServiceJdo,${symbol_escape}
- ${symbol_pound} org.apache.isis.objectstore.jdo.applib.service.settings.UserSettingsServiceJdo,${symbol_escape}
- ${symbol_escape}
- ${symbol_pound} Core (example) implementations of auditing and publishing services, ${symbol_escape}
- ${symbol_pound} org.apache.isis.applib.services.audit.AuditingService3${symbol_dollar}Stderr,${symbol_escape}
- ${symbol_pound} org.apache.isis.applib.services.publish.PublishingService${symbol_dollar}Stderr,${symbol_escape}
- ${symbol_pound}
+ ${symbol_pound},${symbol_escape}
+ 1:webapp.CustomMementoService,${symbol_escape}
+ 1:webapp.CustomRepresentationService
${symbol_pound} Specify the (optional) test fixtures
@@ -197,7 +161,6 @@ ${symbol_pound} Fixtures are used to seed the object store with an initial set o
${symbol_pound} in-memory object store, the fixtures are installed on every run. For other
${symbol_pound} object stores, they are used only when the object store is first initialized.
${symbol_pound}
-${symbol_pound}isis.fixtures.prefix=
isis.fixtures=fixture.todo.scenarios.RecreateToDoItemsForSven
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/persistor.properties
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/persistor.properties b/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/persistor.properties
index fe47df4..3f40b94 100644
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/persistor.properties
+++ b/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/persistor.properties
@@ -19,10 +19,28 @@ ${symbol_pound} specific language governing permissions and limitations
${symbol_pound} under the License.
-${symbol_pound} for emergency use only
+${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
+${symbol_pound}
+${symbol_pound} Persistor
+${symbol_pound}
+${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
+
+
+
+${symbol_pound} generally speaking this should not be enabled
isis.persistor.disableConcurrencyChecking=false
+
+
+${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
+${symbol_pound}
+${symbol_pound} JDBC configuration
+${symbol_pound}
+${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
+
+
+
${symbol_pound}
${symbol_pound} configuration file holding the JDO objectstore's JDBC configuration
${symbol_pound} (this is a bit of a hack... just exploiting fact that Isis also loads this file)
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties b/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties
index cf63b1b..b979a9d 100644
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties
+++ b/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties
@@ -48,6 +48,7 @@ isis.persistor.datanucleus.impl.datanucleus.validateConstraints=true
${symbol_pound}
${symbol_pound} Require explicit persistence (since entities are Comparable and using ObjectContracts${symbol_pound}compareTo).
+${symbol_pound} see http://www.datanucleus.org/products/accessplatform_3_0/jdo/transaction_types.html
${symbol_pound}
isis.persistor.datanucleus.impl.datanucleus.persistenceByReachabilityAtCommit=false
@@ -59,12 +60,14 @@ ${symbol_pound}
isis.persistor.datanucleus.impl.datanucleus.identifier.case=PreserveCase
-${symbol_pound} L2 cache (on by default)
+${symbol_pound}
+${symbol_pound} L2 cache
+${symbol_pound} off except if explicitly marked as cacheable
+${symbol_pound} http://www.datanucleus.org/products/datanucleus/jdo/cache.html
+${symbol_pound}
isis.persistor.datanucleus.impl.datanucleus.cache.level2.type=none
isis.persistor.datanucleus.impl.datanucleus.cache.level2.mode=ENABLE_SELECTIVE
-${symbol_pound}see http://www.datanucleus.org/products/datanucleus/jdo/transaction_types.html${symbol_pound}optimistic
-isis.persistor.datanucleus.impl.datanucleus.persistenceByReachabilityAtCommit=false
${symbol_pound}
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/shiro.ini
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/shiro.ini b/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/shiro.ini
index 8c5f7d3..07ea04f 100644
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/shiro.ini
+++ b/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/shiro.ini
@@ -28,8 +28,6 @@
realm1 = org.apache.shiro.realm.text.IniRealm
realm1.resourcePath=classpath:webapp/realm1.ini
-realm2 = org.apache.shiro.realm.text.IniRealm
-realm2.resourcePath=classpath:webapp/realm2.ini
@@ -69,8 +67,8 @@ ldapRealm.resourcePath=classpath:webapp/realm1.ini
# configure security manager to use realm(s)
#######
-# authenticate/authorize first with realm1, then realm2
-securityManager.realms = $realm1,$realm2
+# authenticate/authorize using realm1
+securityManager.realms = $realm1
# or to use ldap with realm1 as a backup...
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties b/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
index f02c809..9e4fb9d 100644
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
+++ b/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
@@ -50,6 +50,14 @@ ${symbol_pound} not stripped otherwise (Isis' PROTOTYPE mode == Wicket's DEVELOP
${symbol_pound} isis.viewer.wicket.stripWicketTags=false
${symbol_pound}isis.viewer.wicket.suppressRememberMe=true
+
+${symbol_pound}
+${symbol_pound} if user attempts to access a protected URL before signing in, then as a convenience the viewer will continue
+${symbol_pound} through to that destination after successful login. If you consider this to be a security risk then this flag
+${symbol_pound} disables that behaviour.
+${symbol_pound}
+${symbol_pound}isis.viewer.wicket.clearOriginalDestination=true
+
${symbol_pound}isis.viewer.wicket.disableModalDialogs=true
${symbol_pound}isis.viewer.wicket.bookmarkedPages.maxSize=15
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/web.xml b/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/web.xml
index d31ea09..be328e1 100644
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/web.xml
+++ b/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/web.xml
@@ -24,7 +24,7 @@
xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>Quickstart Wicket/RestfulObjects app</display-name>
+ <display-name>Todo app</display-name>
<welcome-file-list>
<welcome-file>about/index.html</welcome-file>
@@ -308,23 +308,4 @@
-->
- <servlet>
- <servlet-name>QuartzInitializer</servlet-name>
- <servlet-class>org.quartz.ee.servlet.QuartzInitializerServlet</servlet-class>
- <init-param>
- <param-name>config-file</param-name>
- <param-value>webapp/scheduler/quartz.properties</param-value>
- </init-param>
- <init-param>
- <param-name>shutdown-on-unload</param-name>
- <param-value>true</param-value>
- </init-param>
- <init-param>
- <param-name>start-scheduler-on-load</param-name>
- <param-value>true</param-value>
- </init-param>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
-
</web-app>
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/about/index.html
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/about/index.html b/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/about/index.html
index 1200900..2a425e5 100644
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/about/index.html
+++ b/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/webapp/about/index.html
@@ -131,7 +131,7 @@ ${symbol_pound}wrapper {
</li>
<li><tt><a href="https://github.com/apache/isis/blob/master/example/application/todo%61pp/webapp/src/main/webapp/WEB-INF/web.xml" target="_blank">WEB-INF/web.xml</a></tt> (in <tt>webapp</tt> module)
<ul>
- <li><tt><a href="https://github.com/apache/isis/blob/master/example/application/todo%61pp/webapp/src/main/webapp/WEB-INF/web.xml${symbol_pound}L98" target="_blank">ResourceCachingFilter</a></tt> and <tt><a href="https://github.com/apache/isis/blob/master/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/web.xml${symbol_pound}L134" target="_blank">ResourceServlet</a></tt> - filter and servlet for serving up static resources.
+ <li><tt><a href="https://github.com/apache/isis/blob/master/example/application/todo%61pp/webapp/src/main/webapp/WEB-INF/web.xml${symbol_pound}L98" target="_blank">ResourceCachingFilter</a></tt> and <tt><a href="https://github.com/apache/isis/blob/master/example/application/todo%61pp/webapp/src/main/webapp/WEB-INF/web.xml${symbol_pound}L134" target="_blank">ResourceServlet</a></tt> - filter and servlet for serving up static resources.
</li>
<li><tt><a href="https://github.com/apache/isis/blob/master/example/application/todo%61pp/webapp/src/main/webapp/WEB-INF/web.xml${symbol_pound}L174" target="_blank">WicketFilter</a></tt> - filter for the wicket application, mapped to <tt>/wicket/*</tt>
</li>
@@ -145,24 +145,24 @@ ${symbol_pound}wrapper {
</li>
<li><tt><a href="https://github.com/apache/isis/blob/master/example/application/todo%61pp/webapp/src/main/webapp/WEB-INF/isis.properties" target="_blank">WEB-INF/isis.properties</a></tt> (in <tt>webapp</tt> module)
<ul>
- <li><tt>isis.services</tt> - specifies the two domain services described above (<tt>ToDoItems</tt> and <tt>ToDoItemsFixtureService</tt>), appearing on the menu bar in the Wicket viewer,
- along with a number of hidden framework-provided domain services demonstrating Isis' support for publishing, auditing and customizable error handling
+ <li><tt>isis.services</tt> - explicitly loaded framework-provide domain services. Other services (including <tt>ToDoItems</tt> and <tt>ToDoItemsFixtureService</tt> described above),
+ are loaded automatically from the classpath.
</li>
- <li><tt>isis.persistor</tt> - specifies to use the JDO object store
+ <li><tt>isis.persistor</tt> - specifies to use Isis' integration with <a href="http://datanucleus.org">DataNucleus</a> for (JDO-based) persistence.
</li>
- <li><tt>isis.authentication</tt> and <tt>isis.authorization</tt> - security mechanism to use (<tt>bypass</tt> effectively disables)
+ <li><tt>isis.authentication</tt> and <tt>isis.authorization</tt> - specifies to use Isis' integration with <a href="http://shiro.apache.org">Apache Shiro</a> for security.
</li>
</ul>
</li>
<li><tt><a href="https://github.com/apache/isis/blob/master/example/application/todo%61pp/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties" target="_blank">WEB-INF/persistor_datanucleus.properties</a></tt> (in <tt>webapp</tt> module)
<ul>
- <li>configuration for JDO object store
+ <li>configuration for the DataNucleus (JDO) object store
</li>
</ul>
</li>
<li><tt><a href="https://github.com/apache/isis/blob/master/example/application/todo%61pp/webapp/src/main/webapp/WEB-INF/persistor.properties" target="_blank">WEB-INF/persistor.properties</a></tt> (in <tt>webapp</tt> module)
<ul>
- <li>JDBC URL for JDO object store
+ <li>JDBC URL for DataNucleus (JDO) object store
</li>
</ul>
</li>
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/test/resources/projects/basic/archetype.properties
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/test/resources/projects/basic/archetype.properties b/example/archetype/todoapp/src/test/resources/projects/basic/archetype.properties
index 10828aa..d48dc88 100644
--- a/example/archetype/todoapp/src/test/resources/projects/basic/archetype.properties
+++ b/example/archetype/todoapp/src/test/resources/projects/basic/archetype.properties
@@ -1,4 +1,4 @@
-#Fri Jul 25 08:24:30 BST 2014
+#Mon Oct 13 23:45:24 BST 2014
package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it
[19/24] git commit: ISIS-864: guard to NOT persist commands if
objects are dirtied as side-effect of 'seed' services (as Estatio and the
security module both use).
Posted by da...@apache.org.
ISIS-864: guard to NOT persist commands if objects are dirtied as side-effect of 'seed' services (as Estatio and the security module both use).
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/240b34d9
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/240b34d9
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/240b34d9
Branch: refs/heads/master
Commit: 240b34d9a66d5094a2d8ceb330a79521db52d430
Parents: a6df3da
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Oct 15 00:35:30 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Oct 15 06:18:48 2014 +0100
----------------------------------------------------------------------
.../isis/core/runtime/system/transaction/IsisTransaction.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/240b34d9/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
index dfb1925..f98c804 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
@@ -745,7 +745,7 @@ public class IsisTransaction implements TransactionScopedComponent {
// ensure that any changed objects means that the command should be persisted
final Set<ObjectAdapter> changedAdapters = findChangedAdapters(changedObjectProperties);
- if(!changedAdapters.isEmpty()) {
+ if(!changedAdapters.isEmpty() && command.getMemberIdentifier() != null) {
command.setPersistHint(true);
}
[03/24] git commit: [maven-release-plugin] prepare release
isis-1.7.0-RC1
Posted by da...@apache.org.
[maven-release-plugin] prepare release isis-1.7.0-RC1
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/d7f0647b
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/d7f0647b
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/d7f0647b
Branch: refs/heads/master
Commit: d7f0647bba943af52cd44bd06822454dda90ae9b
Parents: a6df3da
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Oct 13 20:13:44 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Oct 13 20:13:44 2014 +0100
----------------------------------------------------------------------
core/applib/pom.xml | 2 +-
core/bytecode-cglib/pom.xml | 2 +-
core/bytecode-javassist/pom.xml | 4 +-
core/integtestsupport/pom.xml | 2 +-
core/log4j/pom.xml | 2 +-
core/metamodel/pom.xml | 2 +-
core/objectstore-inmemory/pom.xml | 2 +-
core/objectstore-jdo-datanucleus/pom.xml | 2 +-
core/objectstore-jdo-metamodel/pom.xml | 2 +-
core/pom.xml | 70 +++++++++++------------
core/runtime/pom.xml | 2 +-
core/security-noop/pom.xml | 2 +-
core/security-shiro/pom.xml | 6 +-
core/specsupport/pom.xml | 2 +-
core/tck/pom.xml | 2 +-
core/tck/tck-dom/pom.xml | 2 +-
core/tck/tck-fixture/pom.xml | 2 +-
core/tck/tck-viewer-restfulobjects/pom.xml | 2 +-
core/unittestsupport/pom.xml | 2 +-
core/viewer-restfulobjects-applib/pom.xml | 2 +-
core/viewer-restfulobjects-rendering/pom.xml | 2 +-
core/viewer-restfulobjects-server/pom.xml | 2 +-
core/webserver/pom.xml | 2 +-
core/wrapper/pom.xml | 2 +-
24 files changed, 61 insertions(+), 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/d7f0647b/core/applib/pom.xml
----------------------------------------------------------------------
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index fc1b23d..d1ef3be 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-core-applib</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/d7f0647b/core/bytecode-cglib/pom.xml
----------------------------------------------------------------------
diff --git a/core/bytecode-cglib/pom.xml b/core/bytecode-cglib/pom.xml
index 4c4eb6f..4f8decf 100644
--- a/core/bytecode-cglib/pom.xml
+++ b/core/bytecode-cglib/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-core-bytecode-cglib</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/d7f0647b/core/bytecode-javassist/pom.xml
----------------------------------------------------------------------
diff --git a/core/bytecode-javassist/pom.xml b/core/bytecode-javassist/pom.xml
index 9398006..f03dc72 100644
--- a/core/bytecode-javassist/pom.xml
+++ b/core/bytecode-javassist/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-core-bytecode-javassist</artifactId>
@@ -39,7 +39,7 @@
<connection>scm:svn:http://svn.apache.org/repos/asf/incubator/isis/trunk/runtimes/dflt/bytecode/javassist/</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/isis/trunk$/{relativeUrl}</developerConnection>
<url>http://svn.apache.org/repos/asf/incubator/isis/trunk/runtimes/dflt/bytecode/javassist/</url>
- <tag>HEAD</tag>
+ <tag>isis-1.7.0-RC1</tag>
</scm>
<!-- used in Site generation for relative references. -->
http://git-wip-us.apache.org/repos/asf/isis/blob/d7f0647b/core/integtestsupport/pom.xml
----------------------------------------------------------------------
diff --git a/core/integtestsupport/pom.xml b/core/integtestsupport/pom.xml
index 74aa99f..8ac9730 100644
--- a/core/integtestsupport/pom.xml
+++ b/core/integtestsupport/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-core-integtestsupport</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/d7f0647b/core/log4j/pom.xml
----------------------------------------------------------------------
diff --git a/core/log4j/pom.xml b/core/log4j/pom.xml
index ff14f31..ee0bbab 100644
--- a/core/log4j/pom.xml
+++ b/core/log4j/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-core-log4j</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/d7f0647b/core/metamodel/pom.xml
----------------------------------------------------------------------
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index 7d55d98..ff0a8c1 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-core-metamodel</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/d7f0647b/core/objectstore-inmemory/pom.xml
----------------------------------------------------------------------
diff --git a/core/objectstore-inmemory/pom.xml b/core/objectstore-inmemory/pom.xml
index be8f290..319c66c 100644
--- a/core/objectstore-inmemory/pom.xml
+++ b/core/objectstore-inmemory/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-core-objectstore</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/d7f0647b/core/objectstore-jdo-datanucleus/pom.xml
----------------------------------------------------------------------
diff --git a/core/objectstore-jdo-datanucleus/pom.xml b/core/objectstore-jdo-datanucleus/pom.xml
index 9dc8424..eff072c 100644
--- a/core/objectstore-jdo-datanucleus/pom.xml
+++ b/core/objectstore-jdo-datanucleus/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-core-objectstore-jdo-datanucleus</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/d7f0647b/core/objectstore-jdo-metamodel/pom.xml
----------------------------------------------------------------------
diff --git a/core/objectstore-jdo-metamodel/pom.xml b/core/objectstore-jdo-metamodel/pom.xml
index ef26089..61cc301 100644
--- a/core/objectstore-jdo-metamodel/pom.xml
+++ b/core/objectstore-jdo-metamodel/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-core-objectstore-jdo-metamodel</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/d7f0647b/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index b80e12c..e41af67 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<packaging>pom</packaging>
@@ -153,7 +153,7 @@
<connection>scm:git:http://git.apache.org/isis.git/core</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/isis.git/trunk/framework/</developerConnection>
<url>git://git.apache.org/isis.git/core</url>
- <tag>HEAD</tag>
+ <tag>isis-1.7.0-RC1</tag>
</scm>
<!-- used in Site generation for relative references. -->
@@ -1031,13 +1031,13 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<!-- not scope=test, because referenced by some sql-tests-common under compile scope -->
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1046,14 +1046,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1062,7 +1062,7 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-log4j</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -1071,14 +1071,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1087,52 +1087,52 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-wrapper</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</dependency>
<!-- bytecode components -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-bytecode-cglib</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-bytecode-javassist</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</dependency>
<!-- webserver -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-webserver</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</dependency>
<!-- specsupport -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-specsupport</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</dependency>
<!-- integtestsupport -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-integtestsupport</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<!-- not scope=test, because referenced by some sql-tests-common under compile scope -->
</dependency>
@@ -1140,36 +1140,36 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-objectstore</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-objectstore</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-objectstore-jdo-metamodel</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-objectstore-jdo-metamodel</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-objectstore-jdo-datanucleus</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-objectstore-jdo-datanucleus</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
@@ -1179,36 +1179,36 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1218,12 +1218,12 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</dependency>
@@ -1231,22 +1231,22 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck-dom</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck-fixture</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck-viewer-restfulobjects</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/d7f0647b/core/runtime/pom.xml
----------------------------------------------------------------------
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index 62a7872..b3f3566 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-core-runtime</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/d7f0647b/core/security-noop/pom.xml
----------------------------------------------------------------------
diff --git a/core/security-noop/pom.xml b/core/security-noop/pom.xml
index 45e0963..27330d6 100644
--- a/core/security-noop/pom.xml
+++ b/core/security-noop/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-core-security</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/d7f0647b/core/security-shiro/pom.xml
----------------------------------------------------------------------
diff --git a/core/security-shiro/pom.xml b/core/security-shiro/pom.xml
index 19cbdf5..8773f4e 100644
--- a/core/security-shiro/pom.xml
+++ b/core/security-shiro/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<name>Isis Core Shiro Security</name>
@@ -102,7 +102,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/isis/blob/d7f0647b/core/specsupport/pom.xml
----------------------------------------------------------------------
diff --git a/core/specsupport/pom.xml b/core/specsupport/pom.xml
index 08c8577..734562f 100644
--- a/core/specsupport/pom.xml
+++ b/core/specsupport/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-core-specsupport</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/d7f0647b/core/tck/pom.xml
----------------------------------------------------------------------
diff --git a/core/tck/pom.xml b/core/tck/pom.xml
index a0c97f1..7ff657b 100644
--- a/core/tck/pom.xml
+++ b/core/tck/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-core-tck</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/d7f0647b/core/tck/tck-dom/pom.xml
----------------------------------------------------------------------
diff --git a/core/tck/tck-dom/pom.xml b/core/tck/tck-dom/pom.xml
index 9eda65d..9404cfd 100644
--- a/core/tck/tck-dom/pom.xml
+++ b/core/tck/tck-dom/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-core-tck-dom</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/d7f0647b/core/tck/tck-fixture/pom.xml
----------------------------------------------------------------------
diff --git a/core/tck/tck-fixture/pom.xml b/core/tck/tck-fixture/pom.xml
index 1b07b55..197f2bd 100644
--- a/core/tck/tck-fixture/pom.xml
+++ b/core/tck/tck-fixture/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-core-tck-fixture</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/d7f0647b/core/tck/tck-viewer-restfulobjects/pom.xml
----------------------------------------------------------------------
diff --git a/core/tck/tck-viewer-restfulobjects/pom.xml b/core/tck/tck-viewer-restfulobjects/pom.xml
index 8a5960a..878995a 100644
--- a/core/tck/tck-viewer-restfulobjects/pom.xml
+++ b/core/tck/tck-viewer-restfulobjects/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-core-tck-viewer-restfulobjects</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/d7f0647b/core/unittestsupport/pom.xml
----------------------------------------------------------------------
diff --git a/core/unittestsupport/pom.xml b/core/unittestsupport/pom.xml
index d860a23..b37f0bd 100644
--- a/core/unittestsupport/pom.xml
+++ b/core/unittestsupport/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-core-unittestsupport</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/d7f0647b/core/viewer-restfulobjects-applib/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/pom.xml b/core/viewer-restfulobjects-applib/pom.xml
index 9a790c2..6aaa7d8 100644
--- a/core/viewer-restfulobjects-applib/pom.xml
+++ b/core/viewer-restfulobjects-applib/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/d7f0647b/core/viewer-restfulobjects-rendering/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/pom.xml b/core/viewer-restfulobjects-rendering/pom.xml
index 26898e3..e4c8e31 100644
--- a/core/viewer-restfulobjects-rendering/pom.xml
+++ b/core/viewer-restfulobjects-rendering/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/d7f0647b/core/viewer-restfulobjects-server/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/pom.xml b/core/viewer-restfulobjects-server/pom.xml
index 29014c6..8d51e89 100644
--- a/core/viewer-restfulobjects-server/pom.xml
+++ b/core/viewer-restfulobjects-server/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/d7f0647b/core/webserver/pom.xml
----------------------------------------------------------------------
diff --git a/core/webserver/pom.xml b/core/webserver/pom.xml
index 36b86c0..a080080 100644
--- a/core/webserver/pom.xml
+++ b/core/webserver/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-core-webserver</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/d7f0647b/core/wrapper/pom.xml
----------------------------------------------------------------------
diff --git a/core/wrapper/pom.xml b/core/wrapper/pom.xml
index 565b4d0..0752eff 100644
--- a/core/wrapper/pom.xml
+++ b/core/wrapper/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-core-wrapper</artifactId>
[15/24] ISIS-872: removing old .log file
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis/blob/f509da01/example/application/todoapp/webapp/coverage-error.log
----------------------------------------------------------------------
diff --git a/example/application/todoapp/webapp/coverage-error.log b/example/application/todoapp/webapp/coverage-error.log
deleted file mode 100644
index f62707d..0000000
--- a/example/application/todoapp/webapp/coverage-error.log
+++ /dev/null
@@ -1,1170 +0,0 @@
-[2014.10.03 17:53:28] (Coverage): Error during class instrumentation: org.datanucleus.store.rdbms.mapping.java.LocalDateMapping
-java.lang.NullPointerException
- at com.intellij.rt.coverage.instrumentation.Instrumentator$MyClassWriter.typeInfo(Instrumentator.java:358)
- at com.intellij.rt.coverage.instrumentation.Instrumentator$MyClassWriter.getCommonSuperClass(Instrumentator.java:280)
- at org.jetbrains.org.objectweb.asm.ClassWriter.getMergedType(ClassWriter.java:1654)
- at org.jetbrains.org.objectweb.asm.Frame.merge(Frame.java:1425)
- at org.jetbrains.org.objectweb.asm.Frame.merge(Frame.java:1325)
- at org.jetbrains.org.objectweb.asm.MethodWriter.visitMaxs(MethodWriter.java:1475)
- at org.jetbrains.org.objectweb.asm.MethodVisitor.visitMaxs(MethodVisitor.java:866)
- at com.intellij.rt.coverage.instrumentation.SamplingInstrumenter$1.visitMaxs(SamplingInstrumenter.java:78)
- at org.jetbrains.org.objectweb.asm.ClassReader.readCode(ClassReader.java:1554)
- at org.jetbrains.org.objectweb.asm.ClassReader.readMethod(ClassReader.java:1017)
- at org.jetbrains.org.objectweb.asm.ClassReader.accept(ClassReader.java:693)
- at org.jetbrains.org.objectweb.asm.ClassReader.accept(ClassReader.java:506)
- at com.intellij.rt.coverage.instrumentation.Instrumentator.instrument(Instrumentator.java:177)
- at com.intellij.rt.coverage.instrumentation.Instrumentator.access$000(Instrumentator.java:25)
- at com.intellij.rt.coverage.instrumentation.Instrumentator$1.transform(Instrumentator.java:134)
- at sun.instrument.TransformerManager.transform(TransformerManager.java:188)
- at sun.instrument.InstrumentationImpl.transform(InstrumentationImpl.java:424)
- at java.lang.ClassLoader.defineClass1(Native Method)
- at java.lang.ClassLoader.defineClass(ClassLoader.java:800)
- at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:142)
- at java.net.URLClassLoader.defineClass(URLClassLoader.java:449)
- at java.net.URLClassLoader.access$100(URLClassLoader.java:71)
- at java.net.URLClassLoader$1.run(URLClassLoader.java:361)
- at java.net.URLClassLoader$1.run(URLClassLoader.java:355)
- at java.security.AccessController.doPrivileged(Native Method)
- at java.net.URLClassLoader.findClass(URLClassLoader.java:354)
- at java.lang.ClassLoader.loadClass(ClassLoader.java:425)
- at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:308)
- at java.lang.ClassLoader.loadClass(ClassLoader.java:358)
- at java.lang.Class.forName0(Native Method)
- at java.lang.Class.forName(Class.java:270)
- at org.datanucleus.ClassLoaderResolverImpl.classOrNull(ClassLoaderResolverImpl.java:517)
- at org.datanucleus.ClassLoaderResolverImpl.classForName(ClassLoaderResolverImpl.java:186)
- at org.datanucleus.plugin.NonManagedPluginRegistry.loadClass(NonManagedPluginRegistry.java:643)
- at org.datanucleus.plugin.PluginManager.loadClass(PluginManager.java:341)
- at org.datanucleus.store.rdbms.mapping.MappedTypeManager.addMappedType(MappedTypeManager.java:237)
- at org.datanucleus.store.rdbms.mapping.MappedTypeManager.loadMappings(MappedTypeManager.java:170)
- at org.datanucleus.store.rdbms.mapping.MappedTypeManager.<init>(MappedTypeManager.java:61)
- at org.datanucleus.store.rdbms.RDBMSStoreManager.<init>(RDBMSStoreManager.java:288)
- at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)
- at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:57)
- at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45)
- at java.lang.reflect.Constructor.newInstance(Constructor.java:526)
- at org.datanucleus.plugin.NonManagedPluginRegistry.createExecutableExtension(NonManagedPluginRegistry.java:631)
- at org.datanucleus.plugin.PluginManager.createExecutableExtension(PluginManager.java:301)
- at org.datanucleus.NucleusContext.createStoreManagerForProperties(NucleusContext.java:1245)
- at org.datanucleus.NucleusContext.initialise(NucleusContext.java:356)
- at org.datanucleus.api.jdo.JDOPersistenceManagerFactory.freezeConfiguration(JDOPersistenceManagerFactory.java:775)
- at org.datanucleus.api.jdo.JDOPersistenceManagerFactory.createPersistenceManagerFactory(JDOPersistenceManagerFactory.java:333)
- at org.datanucleus.api.jdo.JDOPersistenceManagerFactory.getPersistenceManagerFactory(JDOPersistenceManagerFactory.java:202)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:606)
- at javax.jdo.JDOHelper$16.run(JDOHelper.java:1970)
- at java.security.AccessController.doPrivileged(Native Method)
- at javax.jdo.JDOHelper.invoke(JDOHelper.java:1965)
- at javax.jdo.JDOHelper.invokeGetPersistenceManagerFactoryOnImplementation(JDOHelper.java:1171)
- at javax.jdo.JDOHelper.getPersistenceManagerFactory(JDOHelper.java:813)
- at javax.jdo.JDOHelper.getPersistenceManagerFactory(JDOHelper.java:702)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusApplicationComponents.init(DataNucleusApplicationComponents.java:107)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusApplicationComponents.<init>(DataNucleusApplicationComponents.java:97)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusPersistenceMechanismInstaller.createDataNucleusApplicationComponentsIfRequired(DataNucleusPersistenceMechanismInstaller.java:127)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusPersistenceMechanismInstaller.createObjectStore(DataNucleusPersistenceMechanismInstaller.java:110)
- at org.apache.isis.core.runtime.installerregistry.installerapi.PersistenceMechanismInstallerAbstract.createPersistenceSession(PersistenceMechanismInstallerAbstract.java:138)
- at org.apache.isis.core.runtime.persistence.PersistenceSessionFactoryDelegating.createPersistenceSession(PersistenceSessionFactoryDelegating.java:97)
- at org.apache.isis.core.runtime.system.session.IsisSessionFactoryDefault.openSession(IsisSessionFactoryDefault.java:235)
- at org.apache.isis.core.runtime.system.context.IsisContextThreadLocal.openSessionInstance(IsisContextThreadLocal.java:149)
- at org.apache.isis.core.runtime.system.context.IsisContext.openSession(IsisContext.java:279)
- at org.apache.isis.core.runtime.system.IsisSystemFixturesHookAbstract.initializeServices(IsisSystemFixturesHookAbstract.java:178)
- at org.apache.isis.core.runtime.system.IsisSystemFixturesHookAbstract.init(IsisSystemFixturesHookAbstract.java:142)
- at org.apache.isis.core.runtime.runner.IsisInjectModule.provideIsisSystem(IsisInjectModule.java:136)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:606)
- at com.google.inject.internal.ProviderMethod.get(ProviderMethod.java:104)
- at com.google.inject.internal.InternalFactoryToProviderAdapter.get(InternalFactoryToProviderAdapter.java:40)
- at com.google.inject.internal.ProviderToInternalFactoryAdapter$1.call(ProviderToInternalFactoryAdapter.java:46)
- at com.google.inject.internal.InjectorImpl.callInContext(InjectorImpl.java:1031)
- at com.google.inject.internal.ProviderToInternalFactoryAdapter.get(ProviderToInternalFactoryAdapter.java:40)
- at com.google.inject.Scopes$1$1.get(Scopes.java:65)
- at com.google.inject.internal.InternalFactoryToProviderAdapter.get(InternalFactoryToProviderAdapter.java:40)
- at com.google.inject.internal.SingleFieldInjector.inject(SingleFieldInjector.java:53)
- at com.google.inject.internal.MembersInjectorImpl.injectMembers(MembersInjectorImpl.java:110)
- at com.google.inject.internal.MembersInjectorImpl$1.call(MembersInjectorImpl.java:75)
- at com.google.inject.internal.MembersInjectorImpl$1.call(MembersInjectorImpl.java:73)
- at com.google.inject.internal.InjectorImpl.callInContext(InjectorImpl.java:1024)
- at com.google.inject.internal.MembersInjectorImpl.injectAndNotify(MembersInjectorImpl.java:73)
- at com.google.inject.internal.MembersInjectorImpl.injectMembers(MembersInjectorImpl.java:60)
- at com.google.inject.internal.InjectorImpl.injectMembers(InjectorImpl.java:944)
- at org.apache.isis.viewer.wicket.viewer.IsisWicketApplication.init(IsisWicketApplication.java:229)
- at org.apache.wicket.Application.initApplication(Application.java:823)
- at org.apache.wicket.protocol.http.WicketFilter.init(WicketFilter.java:424)
- at org.apache.wicket.protocol.http.WicketFilter.init(WicketFilter.java:351)
- at org.mortbay.jetty.servlet.FilterHolder.doStart(FilterHolder.java:97)
- at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:50)
- at org.mortbay.jetty.servlet.ServletHandler.initialize(ServletHandler.java:713)
- at org.mortbay.jetty.servlet.Context.startContext(Context.java:140)
- at org.mortbay.jetty.webapp.WebAppContext.startContext(WebAppContext.java:1282)
- at org.mortbay.jetty.handler.ContextHandler.doStart(ContextHandler.java:518)
- at org.mortbay.jetty.webapp.WebAppContext.doStart(WebAppContext.java:499)
- at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:50)
- at org.mortbay.jetty.handler.HandlerWrapper.doStart(HandlerWrapper.java:130)
- at org.mortbay.jetty.Server.doStart(Server.java:224)
- at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:50)
- at org.apache.isis.core.webserver.WebServerBootstrapper.bootstrap(WebServerBootstrapper.java:93)
- at org.apache.isis.core.webserver.WebServer.run(WebServer.java:92)
- at org.apache.isis.core.webserver.WebServer.main(WebServer.java:68)
- at org.apache.isis.WebServer.main(WebServer.java:25)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:606)
- at com.intellij.rt.execution.application.AppMain.main(AppMain.java:134)
-[2014.10.03 17:53:28] (Coverage): Error during class instrumentation: org.datanucleus.store.rdbms.mapping.java.LocalDateTimeMapping
-java.lang.NullPointerException
- at com.intellij.rt.coverage.instrumentation.Instrumentator$MyClassWriter.typeInfo(Instrumentator.java:358)
- at com.intellij.rt.coverage.instrumentation.Instrumentator$MyClassWriter.getCommonSuperClass(Instrumentator.java:280)
- at org.jetbrains.org.objectweb.asm.ClassWriter.getMergedType(ClassWriter.java:1654)
- at org.jetbrains.org.objectweb.asm.Frame.merge(Frame.java:1425)
- at org.jetbrains.org.objectweb.asm.Frame.merge(Frame.java:1325)
- at org.jetbrains.org.objectweb.asm.MethodWriter.visitMaxs(MethodWriter.java:1475)
- at org.jetbrains.org.objectweb.asm.MethodVisitor.visitMaxs(MethodVisitor.java:866)
- at com.intellij.rt.coverage.instrumentation.SamplingInstrumenter$1.visitMaxs(SamplingInstrumenter.java:78)
- at org.jetbrains.org.objectweb.asm.ClassReader.readCode(ClassReader.java:1554)
- at org.jetbrains.org.objectweb.asm.ClassReader.readMethod(ClassReader.java:1017)
- at org.jetbrains.org.objectweb.asm.ClassReader.accept(ClassReader.java:693)
- at org.jetbrains.org.objectweb.asm.ClassReader.accept(ClassReader.java:506)
- at com.intellij.rt.coverage.instrumentation.Instrumentator.instrument(Instrumentator.java:177)
- at com.intellij.rt.coverage.instrumentation.Instrumentator.access$000(Instrumentator.java:25)
- at com.intellij.rt.coverage.instrumentation.Instrumentator$1.transform(Instrumentator.java:134)
- at sun.instrument.TransformerManager.transform(TransformerManager.java:188)
- at sun.instrument.InstrumentationImpl.transform(InstrumentationImpl.java:424)
- at java.lang.ClassLoader.defineClass1(Native Method)
- at java.lang.ClassLoader.defineClass(ClassLoader.java:800)
- at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:142)
- at java.net.URLClassLoader.defineClass(URLClassLoader.java:449)
- at java.net.URLClassLoader.access$100(URLClassLoader.java:71)
- at java.net.URLClassLoader$1.run(URLClassLoader.java:361)
- at java.net.URLClassLoader$1.run(URLClassLoader.java:355)
- at java.security.AccessController.doPrivileged(Native Method)
- at java.net.URLClassLoader.findClass(URLClassLoader.java:354)
- at java.lang.ClassLoader.loadClass(ClassLoader.java:425)
- at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:308)
- at java.lang.ClassLoader.loadClass(ClassLoader.java:358)
- at java.lang.Class.forName0(Native Method)
- at java.lang.Class.forName(Class.java:270)
- at org.datanucleus.ClassLoaderResolverImpl.classOrNull(ClassLoaderResolverImpl.java:517)
- at org.datanucleus.ClassLoaderResolverImpl.classForName(ClassLoaderResolverImpl.java:186)
- at org.datanucleus.plugin.NonManagedPluginRegistry.loadClass(NonManagedPluginRegistry.java:643)
- at org.datanucleus.plugin.PluginManager.loadClass(PluginManager.java:341)
- at org.datanucleus.store.rdbms.mapping.MappedTypeManager.addMappedType(MappedTypeManager.java:237)
- at org.datanucleus.store.rdbms.mapping.MappedTypeManager.loadMappings(MappedTypeManager.java:170)
- at org.datanucleus.store.rdbms.mapping.MappedTypeManager.<init>(MappedTypeManager.java:61)
- at org.datanucleus.store.rdbms.RDBMSStoreManager.<init>(RDBMSStoreManager.java:288)
- at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)
- at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:57)
- at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45)
- at java.lang.reflect.Constructor.newInstance(Constructor.java:526)
- at org.datanucleus.plugin.NonManagedPluginRegistry.createExecutableExtension(NonManagedPluginRegistry.java:631)
- at org.datanucleus.plugin.PluginManager.createExecutableExtension(PluginManager.java:301)
- at org.datanucleus.NucleusContext.createStoreManagerForProperties(NucleusContext.java:1245)
- at org.datanucleus.NucleusContext.initialise(NucleusContext.java:356)
- at org.datanucleus.api.jdo.JDOPersistenceManagerFactory.freezeConfiguration(JDOPersistenceManagerFactory.java:775)
- at org.datanucleus.api.jdo.JDOPersistenceManagerFactory.createPersistenceManagerFactory(JDOPersistenceManagerFactory.java:333)
- at org.datanucleus.api.jdo.JDOPersistenceManagerFactory.getPersistenceManagerFactory(JDOPersistenceManagerFactory.java:202)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:606)
- at javax.jdo.JDOHelper$16.run(JDOHelper.java:1970)
- at java.security.AccessController.doPrivileged(Native Method)
- at javax.jdo.JDOHelper.invoke(JDOHelper.java:1965)
- at javax.jdo.JDOHelper.invokeGetPersistenceManagerFactoryOnImplementation(JDOHelper.java:1171)
- at javax.jdo.JDOHelper.getPersistenceManagerFactory(JDOHelper.java:813)
- at javax.jdo.JDOHelper.getPersistenceManagerFactory(JDOHelper.java:702)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusApplicationComponents.init(DataNucleusApplicationComponents.java:107)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusApplicationComponents.<init>(DataNucleusApplicationComponents.java:97)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusPersistenceMechanismInstaller.createDataNucleusApplicationComponentsIfRequired(DataNucleusPersistenceMechanismInstaller.java:127)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusPersistenceMechanismInstaller.createObjectStore(DataNucleusPersistenceMechanismInstaller.java:110)
- at org.apache.isis.core.runtime.installerregistry.installerapi.PersistenceMechanismInstallerAbstract.createPersistenceSession(PersistenceMechanismInstallerAbstract.java:138)
- at org.apache.isis.core.runtime.persistence.PersistenceSessionFactoryDelegating.createPersistenceSession(PersistenceSessionFactoryDelegating.java:97)
- at org.apache.isis.core.runtime.system.session.IsisSessionFactoryDefault.openSession(IsisSessionFactoryDefault.java:235)
- at org.apache.isis.core.runtime.system.context.IsisContextThreadLocal.openSessionInstance(IsisContextThreadLocal.java:149)
- at org.apache.isis.core.runtime.system.context.IsisContext.openSession(IsisContext.java:279)
- at org.apache.isis.core.runtime.system.IsisSystemFixturesHookAbstract.initializeServices(IsisSystemFixturesHookAbstract.java:178)
- at org.apache.isis.core.runtime.system.IsisSystemFixturesHookAbstract.init(IsisSystemFixturesHookAbstract.java:142)
- at org.apache.isis.core.runtime.runner.IsisInjectModule.provideIsisSystem(IsisInjectModule.java:136)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:606)
- at com.google.inject.internal.ProviderMethod.get(ProviderMethod.java:104)
- at com.google.inject.internal.InternalFactoryToProviderAdapter.get(InternalFactoryToProviderAdapter.java:40)
- at com.google.inject.internal.ProviderToInternalFactoryAdapter$1.call(ProviderToInternalFactoryAdapter.java:46)
- at com.google.inject.internal.InjectorImpl.callInContext(InjectorImpl.java:1031)
- at com.google.inject.internal.ProviderToInternalFactoryAdapter.get(ProviderToInternalFactoryAdapter.java:40)
- at com.google.inject.Scopes$1$1.get(Scopes.java:65)
- at com.google.inject.internal.InternalFactoryToProviderAdapter.get(InternalFactoryToProviderAdapter.java:40)
- at com.google.inject.internal.SingleFieldInjector.inject(SingleFieldInjector.java:53)
- at com.google.inject.internal.MembersInjectorImpl.injectMembers(MembersInjectorImpl.java:110)
- at com.google.inject.internal.MembersInjectorImpl$1.call(MembersInjectorImpl.java:75)
- at com.google.inject.internal.MembersInjectorImpl$1.call(MembersInjectorImpl.java:73)
- at com.google.inject.internal.InjectorImpl.callInContext(InjectorImpl.java:1024)
- at com.google.inject.internal.MembersInjectorImpl.injectAndNotify(MembersInjectorImpl.java:73)
- at com.google.inject.internal.MembersInjectorImpl.injectMembers(MembersInjectorImpl.java:60)
- at com.google.inject.internal.InjectorImpl.injectMembers(InjectorImpl.java:944)
- at org.apache.isis.viewer.wicket.viewer.IsisWicketApplication.init(IsisWicketApplication.java:229)
- at org.apache.wicket.Application.initApplication(Application.java:823)
- at org.apache.wicket.protocol.http.WicketFilter.init(WicketFilter.java:424)
- at org.apache.wicket.protocol.http.WicketFilter.init(WicketFilter.java:351)
- at org.mortbay.jetty.servlet.FilterHolder.doStart(FilterHolder.java:97)
- at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:50)
- at org.mortbay.jetty.servlet.ServletHandler.initialize(ServletHandler.java:713)
- at org.mortbay.jetty.servlet.Context.startContext(Context.java:140)
- at org.mortbay.jetty.webapp.WebAppContext.startContext(WebAppContext.java:1282)
- at org.mortbay.jetty.handler.ContextHandler.doStart(ContextHandler.java:518)
- at org.mortbay.jetty.webapp.WebAppContext.doStart(WebAppContext.java:499)
- at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:50)
- at org.mortbay.jetty.handler.HandlerWrapper.doStart(HandlerWrapper.java:130)
- at org.mortbay.jetty.Server.doStart(Server.java:224)
- at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:50)
- at org.apache.isis.core.webserver.WebServerBootstrapper.bootstrap(WebServerBootstrapper.java:93)
- at org.apache.isis.core.webserver.WebServer.run(WebServer.java:92)
- at org.apache.isis.core.webserver.WebServer.main(WebServer.java:68)
- at org.apache.isis.WebServer.main(WebServer.java:25)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:606)
- at com.intellij.rt.execution.application.AppMain.main(AppMain.java:134)
-[2014.10.03 17:53:28] (Coverage): Error during class instrumentation: org.datanucleus.store.rdbms.mapping.java.LocalTimeMapping
-java.lang.NullPointerException
- at com.intellij.rt.coverage.instrumentation.Instrumentator$MyClassWriter.typeInfo(Instrumentator.java:358)
- at com.intellij.rt.coverage.instrumentation.Instrumentator$MyClassWriter.getCommonSuperClass(Instrumentator.java:280)
- at org.jetbrains.org.objectweb.asm.ClassWriter.getMergedType(ClassWriter.java:1654)
- at org.jetbrains.org.objectweb.asm.Frame.merge(Frame.java:1425)
- at org.jetbrains.org.objectweb.asm.Frame.merge(Frame.java:1325)
- at org.jetbrains.org.objectweb.asm.MethodWriter.visitMaxs(MethodWriter.java:1475)
- at org.jetbrains.org.objectweb.asm.MethodVisitor.visitMaxs(MethodVisitor.java:866)
- at com.intellij.rt.coverage.instrumentation.SamplingInstrumenter$1.visitMaxs(SamplingInstrumenter.java:78)
- at org.jetbrains.org.objectweb.asm.ClassReader.readCode(ClassReader.java:1554)
- at org.jetbrains.org.objectweb.asm.ClassReader.readMethod(ClassReader.java:1017)
- at org.jetbrains.org.objectweb.asm.ClassReader.accept(ClassReader.java:693)
- at org.jetbrains.org.objectweb.asm.ClassReader.accept(ClassReader.java:506)
- at com.intellij.rt.coverage.instrumentation.Instrumentator.instrument(Instrumentator.java:177)
- at com.intellij.rt.coverage.instrumentation.Instrumentator.access$000(Instrumentator.java:25)
- at com.intellij.rt.coverage.instrumentation.Instrumentator$1.transform(Instrumentator.java:134)
- at sun.instrument.TransformerManager.transform(TransformerManager.java:188)
- at sun.instrument.InstrumentationImpl.transform(InstrumentationImpl.java:424)
- at java.lang.ClassLoader.defineClass1(Native Method)
- at java.lang.ClassLoader.defineClass(ClassLoader.java:800)
- at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:142)
- at java.net.URLClassLoader.defineClass(URLClassLoader.java:449)
- at java.net.URLClassLoader.access$100(URLClassLoader.java:71)
- at java.net.URLClassLoader$1.run(URLClassLoader.java:361)
- at java.net.URLClassLoader$1.run(URLClassLoader.java:355)
- at java.security.AccessController.doPrivileged(Native Method)
- at java.net.URLClassLoader.findClass(URLClassLoader.java:354)
- at java.lang.ClassLoader.loadClass(ClassLoader.java:425)
- at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:308)
- at java.lang.ClassLoader.loadClass(ClassLoader.java:358)
- at java.lang.Class.forName0(Native Method)
- at java.lang.Class.forName(Class.java:270)
- at org.datanucleus.ClassLoaderResolverImpl.classOrNull(ClassLoaderResolverImpl.java:517)
- at org.datanucleus.ClassLoaderResolverImpl.classForName(ClassLoaderResolverImpl.java:186)
- at org.datanucleus.plugin.NonManagedPluginRegistry.loadClass(NonManagedPluginRegistry.java:643)
- at org.datanucleus.plugin.PluginManager.loadClass(PluginManager.java:341)
- at org.datanucleus.store.rdbms.mapping.MappedTypeManager.addMappedType(MappedTypeManager.java:237)
- at org.datanucleus.store.rdbms.mapping.MappedTypeManager.loadMappings(MappedTypeManager.java:170)
- at org.datanucleus.store.rdbms.mapping.MappedTypeManager.<init>(MappedTypeManager.java:61)
- at org.datanucleus.store.rdbms.RDBMSStoreManager.<init>(RDBMSStoreManager.java:288)
- at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)
- at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:57)
- at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45)
- at java.lang.reflect.Constructor.newInstance(Constructor.java:526)
- at org.datanucleus.plugin.NonManagedPluginRegistry.createExecutableExtension(NonManagedPluginRegistry.java:631)
- at org.datanucleus.plugin.PluginManager.createExecutableExtension(PluginManager.java:301)
- at org.datanucleus.NucleusContext.createStoreManagerForProperties(NucleusContext.java:1245)
- at org.datanucleus.NucleusContext.initialise(NucleusContext.java:356)
- at org.datanucleus.api.jdo.JDOPersistenceManagerFactory.freezeConfiguration(JDOPersistenceManagerFactory.java:775)
- at org.datanucleus.api.jdo.JDOPersistenceManagerFactory.createPersistenceManagerFactory(JDOPersistenceManagerFactory.java:333)
- at org.datanucleus.api.jdo.JDOPersistenceManagerFactory.getPersistenceManagerFactory(JDOPersistenceManagerFactory.java:202)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:606)
- at javax.jdo.JDOHelper$16.run(JDOHelper.java:1970)
- at java.security.AccessController.doPrivileged(Native Method)
- at javax.jdo.JDOHelper.invoke(JDOHelper.java:1965)
- at javax.jdo.JDOHelper.invokeGetPersistenceManagerFactoryOnImplementation(JDOHelper.java:1171)
- at javax.jdo.JDOHelper.getPersistenceManagerFactory(JDOHelper.java:813)
- at javax.jdo.JDOHelper.getPersistenceManagerFactory(JDOHelper.java:702)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusApplicationComponents.init(DataNucleusApplicationComponents.java:107)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusApplicationComponents.<init>(DataNucleusApplicationComponents.java:97)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusPersistenceMechanismInstaller.createDataNucleusApplicationComponentsIfRequired(DataNucleusPersistenceMechanismInstaller.java:127)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusPersistenceMechanismInstaller.createObjectStore(DataNucleusPersistenceMechanismInstaller.java:110)
- at org.apache.isis.core.runtime.installerregistry.installerapi.PersistenceMechanismInstallerAbstract.createPersistenceSession(PersistenceMechanismInstallerAbstract.java:138)
- at org.apache.isis.core.runtime.persistence.PersistenceSessionFactoryDelegating.createPersistenceSession(PersistenceSessionFactoryDelegating.java:97)
- at org.apache.isis.core.runtime.system.session.IsisSessionFactoryDefault.openSession(IsisSessionFactoryDefault.java:235)
- at org.apache.isis.core.runtime.system.context.IsisContextThreadLocal.openSessionInstance(IsisContextThreadLocal.java:149)
- at org.apache.isis.core.runtime.system.context.IsisContext.openSession(IsisContext.java:279)
- at org.apache.isis.core.runtime.system.IsisSystemFixturesHookAbstract.initializeServices(IsisSystemFixturesHookAbstract.java:178)
- at org.apache.isis.core.runtime.system.IsisSystemFixturesHookAbstract.init(IsisSystemFixturesHookAbstract.java:142)
- at org.apache.isis.core.runtime.runner.IsisInjectModule.provideIsisSystem(IsisInjectModule.java:136)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:606)
- at com.google.inject.internal.ProviderMethod.get(ProviderMethod.java:104)
- at com.google.inject.internal.InternalFactoryToProviderAdapter.get(InternalFactoryToProviderAdapter.java:40)
- at com.google.inject.internal.ProviderToInternalFactoryAdapter$1.call(ProviderToInternalFactoryAdapter.java:46)
- at com.google.inject.internal.InjectorImpl.callInContext(InjectorImpl.java:1031)
- at com.google.inject.internal.ProviderToInternalFactoryAdapter.get(ProviderToInternalFactoryAdapter.java:40)
- at com.google.inject.Scopes$1$1.get(Scopes.java:65)
- at com.google.inject.internal.InternalFactoryToProviderAdapter.get(InternalFactoryToProviderAdapter.java:40)
- at com.google.inject.internal.SingleFieldInjector.inject(SingleFieldInjector.java:53)
- at com.google.inject.internal.MembersInjectorImpl.injectMembers(MembersInjectorImpl.java:110)
- at com.google.inject.internal.MembersInjectorImpl$1.call(MembersInjectorImpl.java:75)
- at com.google.inject.internal.MembersInjectorImpl$1.call(MembersInjectorImpl.java:73)
- at com.google.inject.internal.InjectorImpl.callInContext(InjectorImpl.java:1024)
- at com.google.inject.internal.MembersInjectorImpl.injectAndNotify(MembersInjectorImpl.java:73)
- at com.google.inject.internal.MembersInjectorImpl.injectMembers(MembersInjectorImpl.java:60)
- at com.google.inject.internal.InjectorImpl.injectMembers(InjectorImpl.java:944)
- at org.apache.isis.viewer.wicket.viewer.IsisWicketApplication.init(IsisWicketApplication.java:229)
- at org.apache.wicket.Application.initApplication(Application.java:823)
- at org.apache.wicket.protocol.http.WicketFilter.init(WicketFilter.java:424)
- at org.apache.wicket.protocol.http.WicketFilter.init(WicketFilter.java:351)
- at org.mortbay.jetty.servlet.FilterHolder.doStart(FilterHolder.java:97)
- at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:50)
- at org.mortbay.jetty.servlet.ServletHandler.initialize(ServletHandler.java:713)
- at org.mortbay.jetty.servlet.Context.startContext(Context.java:140)
- at org.mortbay.jetty.webapp.WebAppContext.startContext(WebAppContext.java:1282)
- at org.mortbay.jetty.handler.ContextHandler.doStart(ContextHandler.java:518)
- at org.mortbay.jetty.webapp.WebAppContext.doStart(WebAppContext.java:499)
- at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:50)
- at org.mortbay.jetty.handler.HandlerWrapper.doStart(HandlerWrapper.java:130)
- at org.mortbay.jetty.Server.doStart(Server.java:224)
- at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:50)
- at org.apache.isis.core.webserver.WebServerBootstrapper.bootstrap(WebServerBootstrapper.java:93)
- at org.apache.isis.core.webserver.WebServer.run(WebServer.java:92)
- at org.apache.isis.core.webserver.WebServer.main(WebServer.java:68)
- at org.apache.isis.WebServer.main(WebServer.java:25)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:606)
- at com.intellij.rt.execution.application.AppMain.main(AppMain.java:134)
-[2014.10.03 17:53:30] (Coverage): Error during class instrumentation: org.datanucleus.store.rdbms.mapping.oracle.OracleClobRDBMSMapping
-java.lang.NullPointerException
- at com.intellij.rt.coverage.instrumentation.Instrumentator$MyClassWriter.typeInfo(Instrumentator.java:358)
- at com.intellij.rt.coverage.instrumentation.Instrumentator$MyClassWriter.getCommonSuperClass(Instrumentator.java:279)
- at org.jetbrains.org.objectweb.asm.ClassWriter.getMergedType(ClassWriter.java:1654)
- at org.jetbrains.org.objectweb.asm.Frame.merge(Frame.java:1425)
- at org.jetbrains.org.objectweb.asm.Frame.merge(Frame.java:1325)
- at org.jetbrains.org.objectweb.asm.MethodWriter.visitMaxs(MethodWriter.java:1475)
- at org.jetbrains.org.objectweb.asm.MethodVisitor.visitMaxs(MethodVisitor.java:866)
- at com.intellij.rt.coverage.instrumentation.SamplingInstrumenter$1.visitMaxs(SamplingInstrumenter.java:78)
- at org.jetbrains.org.objectweb.asm.ClassReader.readCode(ClassReader.java:1554)
- at org.jetbrains.org.objectweb.asm.ClassReader.readMethod(ClassReader.java:1017)
- at org.jetbrains.org.objectweb.asm.ClassReader.accept(ClassReader.java:693)
- at org.jetbrains.org.objectweb.asm.ClassReader.accept(ClassReader.java:506)
- at com.intellij.rt.coverage.instrumentation.Instrumentator.instrument(Instrumentator.java:177)
- at com.intellij.rt.coverage.instrumentation.Instrumentator.access$000(Instrumentator.java:25)
- at com.intellij.rt.coverage.instrumentation.Instrumentator$1.transform(Instrumentator.java:134)
- at sun.instrument.TransformerManager.transform(TransformerManager.java:188)
- at sun.instrument.InstrumentationImpl.transform(InstrumentationImpl.java:424)
- at java.lang.ClassLoader.defineClass1(Native Method)
- at java.lang.ClassLoader.defineClass(ClassLoader.java:800)
- at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:142)
- at java.net.URLClassLoader.defineClass(URLClassLoader.java:449)
- at java.net.URLClassLoader.access$100(URLClassLoader.java:71)
- at java.net.URLClassLoader$1.run(URLClassLoader.java:361)
- at java.net.URLClassLoader$1.run(URLClassLoader.java:355)
- at java.security.AccessController.doPrivileged(Native Method)
- at java.net.URLClassLoader.findClass(URLClassLoader.java:354)
- at java.lang.ClassLoader.loadClass(ClassLoader.java:425)
- at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:308)
- at java.lang.ClassLoader.loadClass(ClassLoader.java:358)
- at java.lang.Class.forName0(Native Method)
- at java.lang.Class.forName(Class.java:270)
- at org.datanucleus.ClassLoaderResolverImpl.classOrNull(ClassLoaderResolverImpl.java:517)
- at org.datanucleus.ClassLoaderResolverImpl.classForName(ClassLoaderResolverImpl.java:186)
- at org.datanucleus.plugin.NonManagedPluginRegistry.loadClass(NonManagedPluginRegistry.java:643)
- at org.datanucleus.plugin.PluginManager.loadClass(PluginManager.java:341)
- at org.datanucleus.store.rdbms.mapping.RDBMSMappingManager.loadDatastoreMapping(RDBMSMappingManager.java:175)
- at org.datanucleus.store.rdbms.adapter.BaseDatastoreAdapter.initialiseTypes(BaseDatastoreAdapter.java:448)
- at org.datanucleus.store.rdbms.adapter.HSQLAdapter.initialiseTypes(HSQLAdapter.java:133)
- at org.datanucleus.store.rdbms.RDBMSStoreManager.<init>(RDBMSStoreManager.java:312)
- at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)
- at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:57)
- at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45)
- at java.lang.reflect.Constructor.newInstance(Constructor.java:526)
- at org.datanucleus.plugin.NonManagedPluginRegistry.createExecutableExtension(NonManagedPluginRegistry.java:631)
- at org.datanucleus.plugin.PluginManager.createExecutableExtension(PluginManager.java:301)
- at org.datanucleus.NucleusContext.createStoreManagerForProperties(NucleusContext.java:1245)
- at org.datanucleus.NucleusContext.initialise(NucleusContext.java:356)
- at org.datanucleus.api.jdo.JDOPersistenceManagerFactory.freezeConfiguration(JDOPersistenceManagerFactory.java:775)
- at org.datanucleus.api.jdo.JDOPersistenceManagerFactory.createPersistenceManagerFactory(JDOPersistenceManagerFactory.java:333)
- at org.datanucleus.api.jdo.JDOPersistenceManagerFactory.getPersistenceManagerFactory(JDOPersistenceManagerFactory.java:202)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:606)
- at javax.jdo.JDOHelper$16.run(JDOHelper.java:1970)
- at java.security.AccessController.doPrivileged(Native Method)
- at javax.jdo.JDOHelper.invoke(JDOHelper.java:1965)
- at javax.jdo.JDOHelper.invokeGetPersistenceManagerFactoryOnImplementation(JDOHelper.java:1171)
- at javax.jdo.JDOHelper.getPersistenceManagerFactory(JDOHelper.java:813)
- at javax.jdo.JDOHelper.getPersistenceManagerFactory(JDOHelper.java:702)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusApplicationComponents.init(DataNucleusApplicationComponents.java:107)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusApplicationComponents.<init>(DataNucleusApplicationComponents.java:97)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusPersistenceMechanismInstaller.createDataNucleusApplicationComponentsIfRequired(DataNucleusPersistenceMechanismInstaller.java:127)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusPersistenceMechanismInstaller.createObjectStore(DataNucleusPersistenceMechanismInstaller.java:110)
- at org.apache.isis.core.runtime.installerregistry.installerapi.PersistenceMechanismInstallerAbstract.createPersistenceSession(PersistenceMechanismInstallerAbstract.java:138)
- at org.apache.isis.core.runtime.persistence.PersistenceSessionFactoryDelegating.createPersistenceSession(PersistenceSessionFactoryDelegating.java:97)
- at org.apache.isis.core.runtime.system.session.IsisSessionFactoryDefault.openSession(IsisSessionFactoryDefault.java:235)
- at org.apache.isis.core.runtime.system.context.IsisContextThreadLocal.openSessionInstance(IsisContextThreadLocal.java:149)
- at org.apache.isis.core.runtime.system.context.IsisContext.openSession(IsisContext.java:279)
- at org.apache.isis.core.runtime.system.IsisSystemFixturesHookAbstract.initializeServices(IsisSystemFixturesHookAbstract.java:178)
- at org.apache.isis.core.runtime.system.IsisSystemFixturesHookAbstract.init(IsisSystemFixturesHookAbstract.java:142)
- at org.apache.isis.core.runtime.runner.IsisInjectModule.provideIsisSystem(IsisInjectModule.java:136)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:606)
- at com.google.inject.internal.ProviderMethod.get(ProviderMethod.java:104)
- at com.google.inject.internal.InternalFactoryToProviderAdapter.get(InternalFactoryToProviderAdapter.java:40)
- at com.google.inject.internal.ProviderToInternalFactoryAdapter$1.call(ProviderToInternalFactoryAdapter.java:46)
- at com.google.inject.internal.InjectorImpl.callInContext(InjectorImpl.java:1031)
- at com.google.inject.internal.ProviderToInternalFactoryAdapter.get(ProviderToInternalFactoryAdapter.java:40)
- at com.google.inject.Scopes$1$1.get(Scopes.java:65)
- at com.google.inject.internal.InternalFactoryToProviderAdapter.get(InternalFactoryToProviderAdapter.java:40)
- at com.google.inject.internal.SingleFieldInjector.inject(SingleFieldInjector.java:53)
- at com.google.inject.internal.MembersInjectorImpl.injectMembers(MembersInjectorImpl.java:110)
- at com.google.inject.internal.MembersInjectorImpl$1.call(MembersInjectorImpl.java:75)
- at com.google.inject.internal.MembersInjectorImpl$1.call(MembersInjectorImpl.java:73)
- at com.google.inject.internal.InjectorImpl.callInContext(InjectorImpl.java:1024)
- at com.google.inject.internal.MembersInjectorImpl.injectAndNotify(MembersInjectorImpl.java:73)
- at com.google.inject.internal.MembersInjectorImpl.injectMembers(MembersInjectorImpl.java:60)
- at com.google.inject.internal.InjectorImpl.injectMembers(InjectorImpl.java:944)
- at org.apache.isis.viewer.wicket.viewer.IsisWicketApplication.init(IsisWicketApplication.java:229)
- at org.apache.wicket.Application.initApplication(Application.java:823)
- at org.apache.wicket.protocol.http.WicketFilter.init(WicketFilter.java:424)
- at org.apache.wicket.protocol.http.WicketFilter.init(WicketFilter.java:351)
- at org.mortbay.jetty.servlet.FilterHolder.doStart(FilterHolder.java:97)
- at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:50)
- at org.mortbay.jetty.servlet.ServletHandler.initialize(ServletHandler.java:713)
- at org.mortbay.jetty.servlet.Context.startContext(Context.java:140)
- at org.mortbay.jetty.webapp.WebAppContext.startContext(WebAppContext.java:1282)
- at org.mortbay.jetty.handler.ContextHandler.doStart(ContextHandler.java:518)
- at org.mortbay.jetty.webapp.WebAppContext.doStart(WebAppContext.java:499)
- at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:50)
- at org.mortbay.jetty.handler.HandlerWrapper.doStart(HandlerWrapper.java:130)
- at org.mortbay.jetty.Server.doStart(Server.java:224)
- at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:50)
- at org.apache.isis.core.webserver.WebServerBootstrapper.bootstrap(WebServerBootstrapper.java:93)
- at org.apache.isis.core.webserver.WebServer.run(WebServer.java:92)
- at org.apache.isis.core.webserver.WebServer.main(WebServer.java:68)
- at org.apache.isis.WebServer.main(WebServer.java:25)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:606)
- at com.intellij.rt.execution.application.AppMain.main(AppMain.java:134)
-[2014.10.03 17:53:30] (Coverage): Error during class instrumentation: org.datanucleus.store.rdbms.mapping.oracle.OracleBlobRDBMSMapping
-java.lang.NullPointerException
- at com.intellij.rt.coverage.instrumentation.Instrumentator$MyClassWriter.typeInfo(Instrumentator.java:358)
- at com.intellij.rt.coverage.instrumentation.Instrumentator$MyClassWriter.getCommonSuperClass(Instrumentator.java:279)
- at org.jetbrains.org.objectweb.asm.ClassWriter.getMergedType(ClassWriter.java:1654)
- at org.jetbrains.org.objectweb.asm.Frame.merge(Frame.java:1425)
- at org.jetbrains.org.objectweb.asm.Frame.merge(Frame.java:1325)
- at org.jetbrains.org.objectweb.asm.MethodWriter.visitMaxs(MethodWriter.java:1475)
- at org.jetbrains.org.objectweb.asm.MethodVisitor.visitMaxs(MethodVisitor.java:866)
- at com.intellij.rt.coverage.instrumentation.SamplingInstrumenter$1.visitMaxs(SamplingInstrumenter.java:78)
- at org.jetbrains.org.objectweb.asm.ClassReader.readCode(ClassReader.java:1554)
- at org.jetbrains.org.objectweb.asm.ClassReader.readMethod(ClassReader.java:1017)
- at org.jetbrains.org.objectweb.asm.ClassReader.accept(ClassReader.java:693)
- at org.jetbrains.org.objectweb.asm.ClassReader.accept(ClassReader.java:506)
- at com.intellij.rt.coverage.instrumentation.Instrumentator.instrument(Instrumentator.java:177)
- at com.intellij.rt.coverage.instrumentation.Instrumentator.access$000(Instrumentator.java:25)
- at com.intellij.rt.coverage.instrumentation.Instrumentator$1.transform(Instrumentator.java:134)
- at sun.instrument.TransformerManager.transform(TransformerManager.java:188)
- at sun.instrument.InstrumentationImpl.transform(InstrumentationImpl.java:424)
- at java.lang.ClassLoader.defineClass1(Native Method)
- at java.lang.ClassLoader.defineClass(ClassLoader.java:800)
- at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:142)
- at java.net.URLClassLoader.defineClass(URLClassLoader.java:449)
- at java.net.URLClassLoader.access$100(URLClassLoader.java:71)
- at java.net.URLClassLoader$1.run(URLClassLoader.java:361)
- at java.net.URLClassLoader$1.run(URLClassLoader.java:355)
- at java.security.AccessController.doPrivileged(Native Method)
- at java.net.URLClassLoader.findClass(URLClassLoader.java:354)
- at java.lang.ClassLoader.loadClass(ClassLoader.java:425)
- at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:308)
- at java.lang.ClassLoader.loadClass(ClassLoader.java:358)
- at java.lang.Class.forName0(Native Method)
- at java.lang.Class.forName(Class.java:270)
- at org.datanucleus.ClassLoaderResolverImpl.classOrNull(ClassLoaderResolverImpl.java:517)
- at org.datanucleus.ClassLoaderResolverImpl.classForName(ClassLoaderResolverImpl.java:186)
- at org.datanucleus.plugin.NonManagedPluginRegistry.loadClass(NonManagedPluginRegistry.java:643)
- at org.datanucleus.plugin.PluginManager.loadClass(PluginManager.java:341)
- at org.datanucleus.store.rdbms.mapping.RDBMSMappingManager.loadDatastoreMapping(RDBMSMappingManager.java:175)
- at org.datanucleus.store.rdbms.adapter.BaseDatastoreAdapter.initialiseTypes(BaseDatastoreAdapter.java:448)
- at org.datanucleus.store.rdbms.adapter.HSQLAdapter.initialiseTypes(HSQLAdapter.java:133)
- at org.datanucleus.store.rdbms.RDBMSStoreManager.<init>(RDBMSStoreManager.java:312)
- at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)
- at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:57)
- at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45)
- at java.lang.reflect.Constructor.newInstance(Constructor.java:526)
- at org.datanucleus.plugin.NonManagedPluginRegistry.createExecutableExtension(NonManagedPluginRegistry.java:631)
- at org.datanucleus.plugin.PluginManager.createExecutableExtension(PluginManager.java:301)
- at org.datanucleus.NucleusContext.createStoreManagerForProperties(NucleusContext.java:1245)
- at org.datanucleus.NucleusContext.initialise(NucleusContext.java:356)
- at org.datanucleus.api.jdo.JDOPersistenceManagerFactory.freezeConfiguration(JDOPersistenceManagerFactory.java:775)
- at org.datanucleus.api.jdo.JDOPersistenceManagerFactory.createPersistenceManagerFactory(JDOPersistenceManagerFactory.java:333)
- at org.datanucleus.api.jdo.JDOPersistenceManagerFactory.getPersistenceManagerFactory(JDOPersistenceManagerFactory.java:202)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:606)
- at javax.jdo.JDOHelper$16.run(JDOHelper.java:1970)
- at java.security.AccessController.doPrivileged(Native Method)
- at javax.jdo.JDOHelper.invoke(JDOHelper.java:1965)
- at javax.jdo.JDOHelper.invokeGetPersistenceManagerFactoryOnImplementation(JDOHelper.java:1171)
- at javax.jdo.JDOHelper.getPersistenceManagerFactory(JDOHelper.java:813)
- at javax.jdo.JDOHelper.getPersistenceManagerFactory(JDOHelper.java:702)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusApplicationComponents.init(DataNucleusApplicationComponents.java:107)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusApplicationComponents.<init>(DataNucleusApplicationComponents.java:97)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusPersistenceMechanismInstaller.createDataNucleusApplicationComponentsIfRequired(DataNucleusPersistenceMechanismInstaller.java:127)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusPersistenceMechanismInstaller.createObjectStore(DataNucleusPersistenceMechanismInstaller.java:110)
- at org.apache.isis.core.runtime.installerregistry.installerapi.PersistenceMechanismInstallerAbstract.createPersistenceSession(PersistenceMechanismInstallerAbstract.java:138)
- at org.apache.isis.core.runtime.persistence.PersistenceSessionFactoryDelegating.createPersistenceSession(PersistenceSessionFactoryDelegating.java:97)
- at org.apache.isis.core.runtime.system.session.IsisSessionFactoryDefault.openSession(IsisSessionFactoryDefault.java:235)
- at org.apache.isis.core.runtime.system.context.IsisContextThreadLocal.openSessionInstance(IsisContextThreadLocal.java:149)
- at org.apache.isis.core.runtime.system.context.IsisContext.openSession(IsisContext.java:279)
- at org.apache.isis.core.runtime.system.IsisSystemFixturesHookAbstract.initializeServices(IsisSystemFixturesHookAbstract.java:178)
- at org.apache.isis.core.runtime.system.IsisSystemFixturesHookAbstract.init(IsisSystemFixturesHookAbstract.java:142)
- at org.apache.isis.core.runtime.runner.IsisInjectModule.provideIsisSystem(IsisInjectModule.java:136)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:606)
- at com.google.inject.internal.ProviderMethod.get(ProviderMethod.java:104)
- at com.google.inject.internal.InternalFactoryToProviderAdapter.get(InternalFactoryToProviderAdapter.java:40)
- at com.google.inject.internal.ProviderToInternalFactoryAdapter$1.call(ProviderToInternalFactoryAdapter.java:46)
- at com.google.inject.internal.InjectorImpl.callInContext(InjectorImpl.java:1031)
- at com.google.inject.internal.ProviderToInternalFactoryAdapter.get(ProviderToInternalFactoryAdapter.java:40)
- at com.google.inject.Scopes$1$1.get(Scopes.java:65)
- at com.google.inject.internal.InternalFactoryToProviderAdapter.get(InternalFactoryToProviderAdapter.java:40)
- at com.google.inject.internal.SingleFieldInjector.inject(SingleFieldInjector.java:53)
- at com.google.inject.internal.MembersInjectorImpl.injectMembers(MembersInjectorImpl.java:110)
- at com.google.inject.internal.MembersInjectorImpl$1.call(MembersInjectorImpl.java:75)
- at com.google.inject.internal.MembersInjectorImpl$1.call(MembersInjectorImpl.java:73)
- at com.google.inject.internal.InjectorImpl.callInContext(InjectorImpl.java:1024)
- at com.google.inject.internal.MembersInjectorImpl.injectAndNotify(MembersInjectorImpl.java:73)
- at com.google.inject.internal.MembersInjectorImpl.injectMembers(MembersInjectorImpl.java:60)
- at com.google.inject.internal.InjectorImpl.injectMembers(InjectorImpl.java:944)
- at org.apache.isis.viewer.wicket.viewer.IsisWicketApplication.init(IsisWicketApplication.java:229)
- at org.apache.wicket.Application.initApplication(Application.java:823)
- at org.apache.wicket.protocol.http.WicketFilter.init(WicketFilter.java:424)
- at org.apache.wicket.protocol.http.WicketFilter.init(WicketFilter.java:351)
- at org.mortbay.jetty.servlet.FilterHolder.doStart(FilterHolder.java:97)
- at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:50)
- at org.mortbay.jetty.servlet.ServletHandler.initialize(ServletHandler.java:713)
- at org.mortbay.jetty.servlet.Context.startContext(Context.java:140)
- at org.mortbay.jetty.webapp.WebAppContext.startContext(WebAppContext.java:1282)
- at org.mortbay.jetty.handler.ContextHandler.doStart(ContextHandler.java:518)
- at org.mortbay.jetty.webapp.WebAppContext.doStart(WebAppContext.java:499)
- at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:50)
- at org.mortbay.jetty.handler.HandlerWrapper.doStart(HandlerWrapper.java:130)
- at org.mortbay.jetty.Server.doStart(Server.java:224)
- at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:50)
- at org.apache.isis.core.webserver.WebServerBootstrapper.bootstrap(WebServerBootstrapper.java:93)
- at org.apache.isis.core.webserver.WebServer.run(WebServer.java:92)
- at org.apache.isis.core.webserver.WebServer.main(WebServer.java:68)
- at org.apache.isis.WebServer.main(WebServer.java:25)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:606)
- at com.intellij.rt.execution.application.AppMain.main(AppMain.java:134)
-[2014.10.03 18:12:52] (Coverage): Error during class instrumentation: org.datanucleus.store.rdbms.mapping.java.LocalDateMapping
-java.lang.NullPointerException
- at com.intellij.rt.coverage.instrumentation.Instrumentator$MyClassWriter.typeInfo(Instrumentator.java:358)
- at com.intellij.rt.coverage.instrumentation.Instrumentator$MyClassWriter.getCommonSuperClass(Instrumentator.java:280)
- at org.jetbrains.org.objectweb.asm.ClassWriter.getMergedType(ClassWriter.java:1654)
- at org.jetbrains.org.objectweb.asm.Frame.merge(Frame.java:1425)
- at org.jetbrains.org.objectweb.asm.Frame.merge(Frame.java:1325)
- at org.jetbrains.org.objectweb.asm.MethodWriter.visitMaxs(MethodWriter.java:1475)
- at org.jetbrains.org.objectweb.asm.MethodVisitor.visitMaxs(MethodVisitor.java:866)
- at com.intellij.rt.coverage.instrumentation.SamplingInstrumenter$1.visitMaxs(SamplingInstrumenter.java:78)
- at org.jetbrains.org.objectweb.asm.ClassReader.readCode(ClassReader.java:1554)
- at org.jetbrains.org.objectweb.asm.ClassReader.readMethod(ClassReader.java:1017)
- at org.jetbrains.org.objectweb.asm.ClassReader.accept(ClassReader.java:693)
- at org.jetbrains.org.objectweb.asm.ClassReader.accept(ClassReader.java:506)
- at com.intellij.rt.coverage.instrumentation.Instrumentator.instrument(Instrumentator.java:177)
- at com.intellij.rt.coverage.instrumentation.Instrumentator.access$000(Instrumentator.java:25)
- at com.intellij.rt.coverage.instrumentation.Instrumentator$1.transform(Instrumentator.java:134)
- at sun.instrument.TransformerManager.transform(TransformerManager.java:188)
- at sun.instrument.InstrumentationImpl.transform(InstrumentationImpl.java:424)
- at java.lang.ClassLoader.defineClass1(Native Method)
- at java.lang.ClassLoader.defineClass(ClassLoader.java:800)
- at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:142)
- at java.net.URLClassLoader.defineClass(URLClassLoader.java:449)
- at java.net.URLClassLoader.access$100(URLClassLoader.java:71)
- at java.net.URLClassLoader$1.run(URLClassLoader.java:361)
- at java.net.URLClassLoader$1.run(URLClassLoader.java:355)
- at java.security.AccessController.doPrivileged(Native Method)
- at java.net.URLClassLoader.findClass(URLClassLoader.java:354)
- at java.lang.ClassLoader.loadClass(ClassLoader.java:425)
- at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:308)
- at java.lang.ClassLoader.loadClass(ClassLoader.java:358)
- at java.lang.Class.forName0(Native Method)
- at java.lang.Class.forName(Class.java:270)
- at org.datanucleus.ClassLoaderResolverImpl.classOrNull(ClassLoaderResolverImpl.java:517)
- at org.datanucleus.ClassLoaderResolverImpl.classForName(ClassLoaderResolverImpl.java:186)
- at org.datanucleus.plugin.NonManagedPluginRegistry.loadClass(NonManagedPluginRegistry.java:643)
- at org.datanucleus.plugin.PluginManager.loadClass(PluginManager.java:341)
- at org.datanucleus.store.rdbms.mapping.MappedTypeManager.addMappedType(MappedTypeManager.java:237)
- at org.datanucleus.store.rdbms.mapping.MappedTypeManager.loadMappings(MappedTypeManager.java:170)
- at org.datanucleus.store.rdbms.mapping.MappedTypeManager.<init>(MappedTypeManager.java:61)
- at org.datanucleus.store.rdbms.RDBMSStoreManager.<init>(RDBMSStoreManager.java:288)
- at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)
- at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:57)
- at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45)
- at java.lang.reflect.Constructor.newInstance(Constructor.java:526)
- at org.datanucleus.plugin.NonManagedPluginRegistry.createExecutableExtension(NonManagedPluginRegistry.java:631)
- at org.datanucleus.plugin.PluginManager.createExecutableExtension(PluginManager.java:301)
- at org.datanucleus.NucleusContext.createStoreManagerForProperties(NucleusContext.java:1245)
- at org.datanucleus.NucleusContext.initialise(NucleusContext.java:356)
- at org.datanucleus.api.jdo.JDOPersistenceManagerFactory.freezeConfiguration(JDOPersistenceManagerFactory.java:775)
- at org.datanucleus.api.jdo.JDOPersistenceManagerFactory.createPersistenceManagerFactory(JDOPersistenceManagerFactory.java:333)
- at org.datanucleus.api.jdo.JDOPersistenceManagerFactory.getPersistenceManagerFactory(JDOPersistenceManagerFactory.java:202)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:606)
- at javax.jdo.JDOHelper$16.run(JDOHelper.java:1970)
- at java.security.AccessController.doPrivileged(Native Method)
- at javax.jdo.JDOHelper.invoke(JDOHelper.java:1965)
- at javax.jdo.JDOHelper.invokeGetPersistenceManagerFactoryOnImplementation(JDOHelper.java:1171)
- at javax.jdo.JDOHelper.getPersistenceManagerFactory(JDOHelper.java:813)
- at javax.jdo.JDOHelper.getPersistenceManagerFactory(JDOHelper.java:702)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusApplicationComponents.init(DataNucleusApplicationComponents.java:107)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusApplicationComponents.<init>(DataNucleusApplicationComponents.java:97)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusPersistenceMechanismInstaller.createDataNucleusApplicationComponentsIfRequired(DataNucleusPersistenceMechanismInstaller.java:127)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusPersistenceMechanismInstaller.createObjectStore(DataNucleusPersistenceMechanismInstaller.java:110)
- at org.apache.isis.core.runtime.installerregistry.installerapi.PersistenceMechanismInstallerAbstract.createPersistenceSession(PersistenceMechanismInstallerAbstract.java:138)
- at org.apache.isis.core.runtime.persistence.PersistenceSessionFactoryDelegating.createPersistenceSession(PersistenceSessionFactoryDelegating.java:97)
- at org.apache.isis.core.runtime.system.session.IsisSessionFactoryDefault.openSession(IsisSessionFactoryDefault.java:235)
- at org.apache.isis.core.runtime.system.context.IsisContextThreadLocal.openSessionInstance(IsisContextThreadLocal.java:149)
- at org.apache.isis.core.runtime.system.context.IsisContext.openSession(IsisContext.java:279)
- at org.apache.isis.core.runtime.system.IsisSystemFixturesHookAbstract.initializeServices(IsisSystemFixturesHookAbstract.java:178)
- at org.apache.isis.core.runtime.system.IsisSystemFixturesHookAbstract.init(IsisSystemFixturesHookAbstract.java:142)
- at org.apache.isis.core.runtime.runner.IsisInjectModule.provideIsisSystem(IsisInjectModule.java:133)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:606)
- at com.google.inject.internal.ProviderMethod.get(ProviderMethod.java:104)
- at com.google.inject.internal.InternalFactoryToProviderAdapter.get(InternalFactoryToProviderAdapter.java:40)
- at com.google.inject.internal.ProviderToInternalFactoryAdapter$1.call(ProviderToInternalFactoryAdapter.java:46)
- at com.google.inject.internal.InjectorImpl.callInContext(InjectorImpl.java:1031)
- at com.google.inject.internal.ProviderToInternalFactoryAdapter.get(ProviderToInternalFactoryAdapter.java:40)
- at com.google.inject.Scopes$1$1.get(Scopes.java:65)
- at com.google.inject.internal.InternalFactoryToProviderAdapter.get(InternalFactoryToProviderAdapter.java:40)
- at com.google.inject.internal.SingleFieldInjector.inject(SingleFieldInjector.java:53)
- at com.google.inject.internal.MembersInjectorImpl.injectMembers(MembersInjectorImpl.java:110)
- at com.google.inject.internal.MembersInjectorImpl$1.call(MembersInjectorImpl.java:75)
- at com.google.inject.internal.MembersInjectorImpl$1.call(MembersInjectorImpl.java:73)
- at com.google.inject.internal.InjectorImpl.callInContext(InjectorImpl.java:1024)
- at com.google.inject.internal.MembersInjectorImpl.injectAndNotify(MembersInjectorImpl.java:73)
- at com.google.inject.internal.MembersInjectorImpl.injectMembers(MembersInjectorImpl.java:60)
- at com.google.inject.internal.InjectorImpl.injectMembers(InjectorImpl.java:944)
- at org.apache.isis.viewer.wicket.viewer.IsisWicketApplication.init(IsisWicketApplication.java:229)
- at org.apache.wicket.Application.initApplication(Application.java:823)
- at org.apache.wicket.protocol.http.WicketFilter.init(WicketFilter.java:424)
- at org.apache.wicket.protocol.http.WicketFilter.init(WicketFilter.java:351)
- at org.mortbay.jetty.servlet.FilterHolder.doStart(FilterHolder.java:97)
- at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:50)
- at org.mortbay.jetty.servlet.ServletHandler.initialize(ServletHandler.java:713)
- at org.mortbay.jetty.servlet.Context.startContext(Context.java:140)
- at org.mortbay.jetty.webapp.WebAppContext.startContext(WebAppContext.java:1282)
- at org.mortbay.jetty.handler.ContextHandler.doStart(ContextHandler.java:518)
- at org.mortbay.jetty.webapp.WebAppContext.doStart(WebAppContext.java:499)
- at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:50)
- at org.mortbay.jetty.handler.HandlerWrapper.doStart(HandlerWrapper.java:130)
- at org.mortbay.jetty.Server.doStart(Server.java:224)
- at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:50)
- at org.apache.isis.core.webserver.WebServerBootstrapper.bootstrap(WebServerBootstrapper.java:93)
- at org.apache.isis.core.webserver.WebServer.run(WebServer.java:92)
- at org.apache.isis.core.webserver.WebServer.main(WebServer.java:68)
- at org.apache.isis.WebServer.main(WebServer.java:25)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:606)
- at com.intellij.rt.execution.application.AppMain.main(AppMain.java:134)
-[2014.10.03 18:12:52] (Coverage): Error during class instrumentation: org.datanucleus.store.rdbms.mapping.java.LocalDateTimeMapping
-java.lang.NullPointerException
- at com.intellij.rt.coverage.instrumentation.Instrumentator$MyClassWriter.typeInfo(Instrumentator.java:358)
- at com.intellij.rt.coverage.instrumentation.Instrumentator$MyClassWriter.getCommonSuperClass(Instrumentator.java:280)
- at org.jetbrains.org.objectweb.asm.ClassWriter.getMergedType(ClassWriter.java:1654)
- at org.jetbrains.org.objectweb.asm.Frame.merge(Frame.java:1425)
- at org.jetbrains.org.objectweb.asm.Frame.merge(Frame.java:1325)
- at org.jetbrains.org.objectweb.asm.MethodWriter.visitMaxs(MethodWriter.java:1475)
- at org.jetbrains.org.objectweb.asm.MethodVisitor.visitMaxs(MethodVisitor.java:866)
- at com.intellij.rt.coverage.instrumentation.SamplingInstrumenter$1.visitMaxs(SamplingInstrumenter.java:78)
- at org.jetbrains.org.objectweb.asm.ClassReader.readCode(ClassReader.java:1554)
- at org.jetbrains.org.objectweb.asm.ClassReader.readMethod(ClassReader.java:1017)
- at org.jetbrains.org.objectweb.asm.ClassReader.accept(ClassReader.java:693)
- at org.jetbrains.org.objectweb.asm.ClassReader.accept(ClassReader.java:506)
- at com.intellij.rt.coverage.instrumentation.Instrumentator.instrument(Instrumentator.java:177)
- at com.intellij.rt.coverage.instrumentation.Instrumentator.access$000(Instrumentator.java:25)
- at com.intellij.rt.coverage.instrumentation.Instrumentator$1.transform(Instrumentator.java:134)
- at sun.instrument.TransformerManager.transform(TransformerManager.java:188)
- at sun.instrument.InstrumentationImpl.transform(InstrumentationImpl.java:424)
- at java.lang.ClassLoader.defineClass1(Native Method)
- at java.lang.ClassLoader.defineClass(ClassLoader.java:800)
- at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:142)
- at java.net.URLClassLoader.defineClass(URLClassLoader.java:449)
- at java.net.URLClassLoader.access$100(URLClassLoader.java:71)
- at java.net.URLClassLoader$1.run(URLClassLoader.java:361)
- at java.net.URLClassLoader$1.run(URLClassLoader.java:355)
- at java.security.AccessController.doPrivileged(Native Method)
- at java.net.URLClassLoader.findClass(URLClassLoader.java:354)
- at java.lang.ClassLoader.loadClass(ClassLoader.java:425)
- at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:308)
- at java.lang.ClassLoader.loadClass(ClassLoader.java:358)
- at java.lang.Class.forName0(Native Method)
- at java.lang.Class.forName(Class.java:270)
- at org.datanucleus.ClassLoaderResolverImpl.classOrNull(ClassLoaderResolverImpl.java:517)
- at org.datanucleus.ClassLoaderResolverImpl.classForName(ClassLoaderResolverImpl.java:186)
- at org.datanucleus.plugin.NonManagedPluginRegistry.loadClass(NonManagedPluginRegistry.java:643)
- at org.datanucleus.plugin.PluginManager.loadClass(PluginManager.java:341)
- at org.datanucleus.store.rdbms.mapping.MappedTypeManager.addMappedType(MappedTypeManager.java:237)
- at org.datanucleus.store.rdbms.mapping.MappedTypeManager.loadMappings(MappedTypeManager.java:170)
- at org.datanucleus.store.rdbms.mapping.MappedTypeManager.<init>(MappedTypeManager.java:61)
- at org.datanucleus.store.rdbms.RDBMSStoreManager.<init>(RDBMSStoreManager.java:288)
- at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)
- at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:57)
- at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45)
- at java.lang.reflect.Constructor.newInstance(Constructor.java:526)
- at org.datanucleus.plugin.NonManagedPluginRegistry.createExecutableExtension(NonManagedPluginRegistry.java:631)
- at org.datanucleus.plugin.PluginManager.createExecutableExtension(PluginManager.java:301)
- at org.datanucleus.NucleusContext.createStoreManagerForProperties(NucleusContext.java:1245)
- at org.datanucleus.NucleusContext.initialise(NucleusContext.java:356)
- at org.datanucleus.api.jdo.JDOPersistenceManagerFactory.freezeConfiguration(JDOPersistenceManagerFactory.java:775)
- at org.datanucleus.api.jdo.JDOPersistenceManagerFactory.createPersistenceManagerFactory(JDOPersistenceManagerFactory.java:333)
- at org.datanucleus.api.jdo.JDOPersistenceManagerFactory.getPersistenceManagerFactory(JDOPersistenceManagerFactory.java:202)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:606)
- at javax.jdo.JDOHelper$16.run(JDOHelper.java:1970)
- at java.security.AccessController.doPrivileged(Native Method)
- at javax.jdo.JDOHelper.invoke(JDOHelper.java:1965)
- at javax.jdo.JDOHelper.invokeGetPersistenceManagerFactoryOnImplementation(JDOHelper.java:1171)
- at javax.jdo.JDOHelper.getPersistenceManagerFactory(JDOHelper.java:813)
- at javax.jdo.JDOHelper.getPersistenceManagerFactory(JDOHelper.java:702)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusApplicationComponents.init(DataNucleusApplicationComponents.java:107)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusApplicationComponents.<init>(DataNucleusApplicationComponents.java:97)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusPersistenceMechanismInstaller.createDataNucleusApplicationComponentsIfRequired(DataNucleusPersistenceMechanismInstaller.java:127)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusPersistenceMechanismInstaller.createObjectStore(DataNucleusPersistenceMechanismInstaller.java:110)
- at org.apache.isis.core.runtime.installerregistry.installerapi.PersistenceMechanismInstallerAbstract.createPersistenceSession(PersistenceMechanismInstallerAbstract.java:138)
- at org.apache.isis.core.runtime.persistence.PersistenceSessionFactoryDelegating.createPersistenceSession(PersistenceSessionFactoryDelegating.java:97)
- at org.apache.isis.core.runtime.system.session.IsisSessionFactoryDefault.openSession(IsisSessionFactoryDefault.java:235)
- at org.apache.isis.core.runtime.system.context.IsisContextThreadLocal.openSessionInstance(IsisContextThreadLocal.java:149)
- at org.apache.isis.core.runtime.system.context.IsisContext.openSession(IsisContext.java:279)
- at org.apache.isis.core.runtime.system.IsisSystemFixturesHookAbstract.initializeServices(IsisSystemFixturesHookAbstract.java:178)
- at org.apache.isis.core.runtime.system.IsisSystemFixturesHookAbstract.init(IsisSystemFixturesHookAbstract.java:142)
- at org.apache.isis.core.runtime.runner.IsisInjectModule.provideIsisSystem(IsisInjectModule.java:133)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:606)
- at com.google.inject.internal.ProviderMethod.get(ProviderMethod.java:104)
- at com.google.inject.internal.InternalFactoryToProviderAdapter.get(InternalFactoryToProviderAdapter.java:40)
- at com.google.inject.internal.ProviderToInternalFactoryAdapter$1.call(ProviderToInternalFactoryAdapter.java:46)
- at com.google.inject.internal.InjectorImpl.callInContext(InjectorImpl.java:1031)
- at com.google.inject.internal.ProviderToInternalFactoryAdapter.get(ProviderToInternalFactoryAdapter.java:40)
- at com.google.inject.Scopes$1$1.get(Scopes.java:65)
- at com.google.inject.internal.InternalFactoryToProviderAdapter.get(InternalFactoryToProviderAdapter.java:40)
- at com.google.inject.internal.SingleFieldInjector.inject(SingleFieldInjector.java:53)
- at com.google.inject.internal.MembersInjectorImpl.injectMembers(MembersInjectorImpl.java:110)
- at com.google.inject.internal.MembersInjectorImpl$1.call(MembersInjectorImpl.java:75)
- at com.google.inject.internal.MembersInjectorImpl$1.call(MembersInjectorImpl.java:73)
- at com.google.inject.internal.InjectorImpl.callInContext(InjectorImpl.java:1024)
- at com.google.inject.internal.MembersInjectorImpl.injectAndNotify(MembersInjectorImpl.java:73)
- at com.google.inject.internal.MembersInjectorImpl.injectMembers(MembersInjectorImpl.java:60)
- at com.google.inject.internal.InjectorImpl.injectMembers(InjectorImpl.java:944)
- at org.apache.isis.viewer.wicket.viewer.IsisWicketApplication.init(IsisWicketApplication.java:229)
- at org.apache.wicket.Application.initApplication(Application.java:823)
- at org.apache.wicket.protocol.http.WicketFilter.init(WicketFilter.java:424)
- at org.apache.wicket.protocol.http.WicketFilter.init(WicketFilter.java:351)
- at org.mortbay.jetty.servlet.FilterHolder.doStart(FilterHolder.java:97)
- at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:50)
- at org.mortbay.jetty.servlet.ServletHandler.initialize(ServletHandler.java:713)
- at org.mortbay.jetty.servlet.Context.startContext(Context.java:140)
- at org.mortbay.jetty.webapp.WebAppContext.startContext(WebAppContext.java:1282)
- at org.mortbay.jetty.handler.ContextHandler.doStart(ContextHandler.java:518)
- at org.mortbay.jetty.webapp.WebAppContext.doStart(WebAppContext.java:499)
- at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:50)
- at org.mortbay.jetty.handler.HandlerWrapper.doStart(HandlerWrapper.java:130)
- at org.mortbay.jetty.Server.doStart(Server.java:224)
- at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:50)
- at org.apache.isis.core.webserver.WebServerBootstrapper.bootstrap(WebServerBootstrapper.java:93)
- at org.apache.isis.core.webserver.WebServer.run(WebServer.java:92)
- at org.apache.isis.core.webserver.WebServer.main(WebServer.java:68)
- at org.apache.isis.WebServer.main(WebServer.java:25)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:606)
- at com.intellij.rt.execution.application.AppMain.main(AppMain.java:134)
-[2014.10.03 18:12:52] (Coverage): Error during class instrumentation: org.datanucleus.store.rdbms.mapping.java.LocalTimeMapping
-java.lang.NullPointerException
- at com.intellij.rt.coverage.instrumentation.Instrumentator$MyClassWriter.typeInfo(Instrumentator.java:358)
- at com.intellij.rt.coverage.instrumentation.Instrumentator$MyClassWriter.getCommonSuperClass(Instrumentator.java:280)
- at org.jetbrains.org.objectweb.asm.ClassWriter.getMergedType(ClassWriter.java:1654)
- at org.jetbrains.org.objectweb.asm.Frame.merge(Frame.java:1425)
- at org.jetbrains.org.objectweb.asm.Frame.merge(Frame.java:1325)
- at org.jetbrains.org.objectweb.asm.MethodWriter.visitMaxs(MethodWriter.java:1475)
- at org.jetbrains.org.objectweb.asm.MethodVisitor.visitMaxs(MethodVisitor.java:866)
- at com.intellij.rt.coverage.instrumentation.SamplingInstrumenter$1.visitMaxs(SamplingInstrumenter.java:78)
- at org.jetbrains.org.objectweb.asm.ClassReader.readCode(ClassReader.java:1554)
- at org.jetbrains.org.objectweb.asm.ClassReader.readMethod(ClassReader.java:1017)
- at org.jetbrains.org.objectweb.asm.ClassReader.accept(ClassReader.java:693)
- at org.jetbrains.org.objectweb.asm.ClassReader.accept(ClassReader.java:506)
- at com.intellij.rt.coverage.instrumentation.Instrumentator.instrument(Instrumentator.java:177)
- at com.intellij.rt.coverage.instrumentation.Instrumentator.access$000(Instrumentator.java:25)
- at com.intellij.rt.coverage.instrumentation.Instrumentator$1.transform(Instrumentator.java:134)
- at sun.instrument.TransformerManager.transform(TransformerManager.java:188)
- at sun.instrument.InstrumentationImpl.transform(InstrumentationImpl.java:424)
- at java.lang.ClassLoader.defineClass1(Native Method)
- at java.lang.ClassLoader.defineClass(ClassLoader.java:800)
- at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:142)
- at java.net.URLClassLoader.defineClass(URLClassLoader.java:449)
- at java.net.URLClassLoader.access$100(URLClassLoader.java:71)
- at java.net.URLClassLoader$1.run(URLClassLoader.java:361)
- at java.net.URLClassLoader$1.run(URLClassLoader.java:355)
- at java.security.AccessController.doPrivileged(Native Method)
- at java.net.URLClassLoader.findClass(URLClassLoader.java:354)
- at java.lang.ClassLoader.loadClass(ClassLoader.java:425)
- at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:308)
- at java.lang.ClassLoader.loadClass(ClassLoader.java:358)
- at java.lang.Class.forName0(Native Method)
- at java.lang.Class.forName(Class.java:270)
- at org.datanucleus.ClassLoaderResolverImpl.classOrNull(ClassLoaderResolverImpl.java:517)
- at org.datanucleus.ClassLoaderResolverImpl.classForName(ClassLoaderResolverImpl.java:186)
- at org.datanucleus.plugin.NonManagedPluginRegistry.loadClass(NonManagedPluginRegistry.java:643)
- at org.datanucleus.plugin.PluginManager.loadClass(PluginManager.java:341)
- at org.datanucleus.store.rdbms.mapping.MappedTypeManager.addMappedType(MappedTypeManager.java:237)
- at org.datanucleus.store.rdbms.mapping.MappedTypeManager.loadMappings(MappedTypeManager.java:170)
- at org.datanucleus.store.rdbms.mapping.MappedTypeManager.<init>(MappedTypeManager.java:61)
- at org.datanucleus.store.rdbms.RDBMSStoreManager.<init>(RDBMSStoreManager.java:288)
- at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)
- at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:57)
- at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45)
- at java.lang.reflect.Constructor.newInstance(Constructor.java:526)
- at org.datanucleus.plugin.NonManagedPluginRegistry.createExecutableExtension(NonManagedPluginRegistry.java:631)
- at org.datanucleus.plugin.PluginManager.createExecutableExtension(PluginManager.java:301)
- at org.datanucleus.NucleusContext.createStoreManagerForProperties(NucleusContext.java:1245)
- at org.datanucleus.NucleusContext.initialise(NucleusContext.java:356)
- at org.datanucleus.api.jdo.JDOPersistenceManagerFactory.freezeConfiguration(JDOPersistenceManagerFactory.java:775)
- at org.datanucleus.api.jdo.JDOPersistenceManagerFactory.createPersistenceManagerFactory(JDOPersistenceManagerFactory.java:333)
- at org.datanucleus.api.jdo.JDOPersistenceManagerFactory.getPersistenceManagerFactory(JDOPersistenceManagerFactory.java:202)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:606)
- at javax.jdo.JDOHelper$16.run(JDOHelper.java:1970)
- at java.security.AccessController.doPrivileged(Native Method)
- at javax.jdo.JDOHelper.invoke(JDOHelper.java:1965)
- at javax.jdo.JDOHelper.invokeGetPersistenceManagerFactoryOnImplementation(JDOHelper.java:1171)
- at javax.jdo.JDOHelper.getPersistenceManagerFactory(JDOHelper.java:813)
- at javax.jdo.JDOHelper.getPersistenceManagerFactory(JDOHelper.java:702)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusApplicationComponents.init(DataNucleusApplicationComponents.java:107)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusApplicationComponents.<init>(DataNucleusApplicationComponents.java:97)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusPersistenceMechanismInstaller.createDataNucleusApplicationComponentsIfRequired(DataNucleusPersistenceMechanismInstaller.java:127)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusPersistenceMechanismInstaller.createObjectStore(DataNucleusPersistenceMechanismInstaller.java:110)
- at org.apache.isis.core.runtime.installerregistry.installerapi.PersistenceMechanismInstallerAbstract.createPersistenceSession(PersistenceMechanismInstallerAbstract.java:138)
- at org.apache.isis.core.runtime.persistence.PersistenceSessionFactoryDelegating.createPersistenceSession(PersistenceSessionFactoryDelegating.java:97)
- at org.apache.isis.core.runtime.system.session.IsisSessionFactoryDefault.openSession(IsisSessionFactoryDefault.java:235)
- at org.apache.isis.core.runtime.system.context.IsisContextThreadLocal.openSessionInstance(IsisContextThreadLocal.java:149)
- at org.apache.isis.core.runtime.system.context.IsisContext.openSession(IsisContext.java:279)
- at org.apache.isis.core.runtime.system.IsisSystemFixturesHookAbstract.initializeServices(IsisSystemFixturesHookAbstract.java:178)
- at org.apache.isis.core.runtime.system.IsisSystemFixturesHookAbstract.init(IsisSystemFixturesHookAbstract.java:142)
- at org.apache.isis.core.runtime.runner.IsisInjectModule.provideIsisSystem(IsisInjectModule.java:133)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:606)
- at com.google.inject.internal.ProviderMethod.get(ProviderMethod.java:104)
- at com.google.inject.internal.InternalFactoryToProviderAdapter.get(InternalFactoryToProviderAdapter.java:40)
- at com.google.inject.internal.ProviderToInternalFactoryAdapter$1.call(ProviderToInternalFactoryAdapter.java:46)
- at com.google.inject.internal.InjectorImpl.callInContext(InjectorImpl.java:1031)
- at com.google.inject.internal.ProviderToInternalFactoryAdapter.get(ProviderToInternalFactoryAdapter.java:40)
- at com.google.inject.Scopes$1$1.get(Scopes.java:65)
- at com.google.inject.internal.InternalFactoryToProviderAdapter.get(InternalFactoryToProviderAdapter.java:40)
- at com.google.inject.internal.SingleFieldInjector.inject(SingleFieldInjector.java:53)
- at com.google.inject.internal.MembersInjectorImpl.injectMembers(MembersInjectorImpl.java:110)
- at com.google.inject.internal.MembersInjectorImpl$1.call(MembersInjectorImpl.java:75)
- at com.google.inject.internal.MembersInjectorImpl$1.call(MembersInjectorImpl.java:73)
- at com.google.inject.internal.InjectorImpl.callInContext(InjectorImpl.java:1024)
- at com.google.inject.internal.MembersInjectorImpl.injectAndNotify(MembersInjectorImpl.java:73)
- at com.google.inject.internal.MembersInjectorImpl.injectMembers(MembersInjectorImpl.java:60)
- at com.google.inject.internal.InjectorImpl.injectMembers(InjectorImpl.java:944)
- at org.apache.isis.viewer.wicket.viewer.IsisWicketApplication.init(IsisWicketApplication.java:229)
- at org.apache.wicket.Application.initApplication(Application.java:823)
- at org.apache.wicket.protocol.http.WicketFilter.init(WicketFilter.java:424)
- at org.apache.wicket.protocol.http.WicketFilter.init(WicketFilter.java:351)
- at org.mortbay.jetty.servlet.FilterHolder.doStart(FilterHolder.java:97)
- at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:50)
- at org.mortbay.jetty.servlet.ServletHandler.initialize(ServletHandler.java:713)
- at org.mortbay.jetty.servlet.Context.startContext(Context.java:140)
- at org.mortbay.jetty.webapp.WebAppContext.startContext(WebAppContext.java:1282)
- at org.mortbay.jetty.handler.ContextHandler.doStart(ContextHandler.java:518)
- at org.mortbay.jetty.webapp.WebAppContext.doStart(WebAppContext.java:499)
- at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:50)
- at org.mortbay.jetty.handler.HandlerWrapper.doStart(HandlerWrapper.java:130)
- at org.mortbay.jetty.Server.doStart(Server.java:224)
- at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:50)
- at org.apache.isis.core.webserver.WebServerBootstrapper.bootstrap(WebServerBootstrapper.java:93)
- at org.apache.isis.core.webserver.WebServer.run(WebServer.java:92)
- at org.apache.isis.core.webserver.WebServer.main(WebServer.java:68)
- at org.apache.isis.WebServer.main(WebServer.java:25)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:606)
- at com.intellij.rt.execution.application.AppMain.main(AppMain.java:134)
-[2014.10.03 18:12:53] (Coverage): Error during class instrumentation: org.datanucleus.store.rdbms.mapping.oracle.OracleClobRDBMSMapping
-java.lang.NullPointerException
- at com.intellij.rt.coverage.instrumentation.Instrumentator$MyClassWriter.typeInfo(Instrumentator.java:358)
- at com.intellij.rt.coverage.instrumentation.Instrumentator$MyClassWriter.getCommonSuperClass(Instrumentator.java:279)
- at org.jetbrains.org.objectweb.asm.ClassWriter.getMergedType(ClassWriter.java:1654)
- at org.jetbrains.org.objectweb.asm.Frame.merge(Frame.java:1425)
- at org.jetbrains.org.objectweb.asm.Frame.merge(Frame.java:1325)
- at org.jetbrains.org.objectweb.asm.MethodWriter.visitMaxs(MethodWriter.java:1475)
- at org.jetbrains.org.objectweb.asm.MethodVisitor.visitMaxs(MethodVisitor.java:866)
- at com.intellij.rt.coverage.instrumentation.SamplingInstrumenter$1.visitMaxs(SamplingInstrumenter.java:78)
- at org.jetbrains.org.objectweb.asm.ClassReader.readCode(ClassReader.java:1554)
- at org.jetbrains.org.objectweb.asm.ClassReader.readMethod(ClassReader.java:1017)
- at org.jetbrains.org.objectweb.asm.ClassReader.accept(ClassReader.java:693)
- at org.jetbrains.org.objectweb.asm.ClassReader.accept(ClassReader.java:506)
- at com.intellij.rt.coverage.instrumentation.Instrumentator.instrument(Instrumentator.java:177)
- at com.intellij.rt.coverage.instrumentation.Instrumentator.access$000(Instrumentator.java:25)
- at com.intellij.rt.coverage.instrumentation.Instrumentator$1.transform(Instrumentator.java:134)
- at sun.instrument.TransformerManager.transform(TransformerManager.java:188)
- at sun.instrument.InstrumentationImpl.transform(InstrumentationImpl.java:424)
- at java.lang.ClassLoader.defineClass1(Native Method)
- at java.lang.ClassLoader.defineClass(ClassLoader.java:800)
- at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:142)
- at java.net.URLClassLoader.defineClass(URLClassLoader.java:449)
- at java.net.URLClassLoader.access$100(URLClassLoader.java:71)
- at java.net.URLClassLoader$1.run(URLClassLoader.java:361)
- at java.net.URLClassLoader$1.run(URLClassLoader.java:355)
- at java.security.AccessController.doPrivileged(Native Method)
- at java.net.URLClassLoader.findClass(URLClassLoader.java:354)
- at java.lang.ClassLoader.loadClass(ClassLoader.java:425)
- at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:308)
- at java.lang.ClassLoader.loadClass(ClassLoader.java:358)
- at java.lang.Class.forName0(Native Method)
- at java.lang.Class.forName(Class.java:270)
- at org.datanucleus.ClassLoaderResolverImpl.classOrNull(ClassLoaderResolverImpl.java:517)
- at org.datanucleus.ClassLoaderResolverImpl.classForName(ClassLoaderResolverImpl.java:186)
- at org.datanucleus.plugin.NonManagedPluginRegistry.loadClass(NonManagedPluginRegistry.java:643)
- at org.datanucleus.plugin.PluginManager.loadClass(PluginManager.java:341)
- at org.datanucleus.store.rdbms.mapping.RDBMSMappingManager.loadDatastoreMapping(RDBMSMappingManager.java:175)
- at org.datanucleus.store.rdbms.adapter.BaseDatastoreAdapter.initialiseTypes(BaseDatastoreAdapter.java:448)
- at org.datanucleus.store.rdbms.adapter.HSQLAdapter.initialiseTypes(HSQLAdapter.java:133)
- at org.datanucleus.store.rdbms.RDBMSStoreManager.<init>(RDBMSStoreManager.java:312)
- at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)
- at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:57)
- at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45)
- at java.lang.reflect.Constructor.newInstance(Constructor.java:526)
- at org.datanucleus.plugin.NonManagedPluginRegistry.createExecutableExtension(NonManagedPluginRegistry.java:631)
- at org.datanucleus.plugin.PluginManager.createExecutableExtension(PluginManager.java:301)
- at org.datanucleus.NucleusContext.createStoreManagerForProperties(NucleusContext.java:1245)
- at org.datanucleus.NucleusContext.initialise(NucleusContext.java:356)
- at org.datanucleus.api.jdo.JDOPersistenceManagerFactory.freezeConfiguration(JDOPersistenceManagerFactory.java:775)
- at org.datanucleus.api.jdo.JDOPersistenceManagerFactory.createPersistenceManagerFactory(JDOPersistenceManagerFactory.java:333)
- at org.datanucleus.api.jdo.JDOPersistenceManagerFactory.getPersistenceManagerFactory(JDOPersistenceManagerFactory.java:202)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:606)
- at javax.jdo.JDOHelper$16.run(JDOHelper.java:1970)
- at java.security.AccessController.doPrivileged(Native Method)
- at javax.jdo.JDOHelper.invoke(JDOHelper.java:1965)
- at javax.jdo.JDOHelper.invokeGetPersistenceManagerFactoryOnImplementation(JDOHelper.java:1171)
- at javax.jdo.JDOHelper.getPersistenceManagerFactory(JDOHelper.java:813)
- at javax.jdo.JDOHelper.getPersistenceManagerFactory(JDOHelper.java:702)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusApplicationComponents.init(DataNucleusApplicationComponents.java:107)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusApplicationComponents.<init>(DataNucleusApplicationComponents.java:97)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusPersistenceMechanismInstaller.createDataNucleusApplicationComponentsIfRequired(DataNucleusPersistenceMechanismInstaller.java:127)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusPersistenceMechanismInstaller.createObjectStore(DataNucleusPersistenceMechanismInstaller.java:110)
- at org.apache.isis.core.runtime.installerregistry.installerapi.PersistenceMechanismInstallerAbstract.createPersistenceSession(PersistenceMechanismInstallerAbstract.java:138)
- at org.apache.isis.core.runtime.persistence.PersistenceSessionFactoryDelegating.createPersistenceSession(PersistenceSessionFactoryDelegating.java:97)
- at org.apache.isis.core.runtime.system.session.IsisSessionFactoryDefault.openSession(IsisSessionFactoryDefault.java:235)
- at org.apache.isis.core.runtime.system.context.IsisContextThreadLocal.openSessionInstance(IsisContextThreadLocal.java:149)
- at org.apache.isis.core.runtime.system.context.IsisContext.openSession(IsisContext.java:279)
- at org.apache.isis.core.runtime.system.IsisSystemFixturesHookAbstract.initializeServices(IsisSystemFixturesHookAbstract.java:178)
- at org.apache.isis.core.runtime.system.IsisSystemFixturesHookAbstract.init(IsisSystemFixturesHookAbstract.java:142)
- at org.apache.isis.core.runtime.runner.IsisInjectModule.provideIsisSystem(IsisInjectModule.java:133)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:606)
- at com.google.inject.internal.ProviderMethod.get(ProviderMethod.java:104)
- at com.google.inject.internal.InternalFactoryToProviderAdapter.get(InternalFactoryToProviderAdapter.java:40)
- at com.google.inject.internal.ProviderToInternalFactoryAdapter$1.call(ProviderToInternalFactoryAdapter.java:46)
- at com.google.inject.internal.InjectorImpl.callInContext(InjectorImpl.java:1031)
- at com.google.inject.internal.ProviderToInternalFactoryAdapter.get(ProviderToInternalFactoryAdapter.java:40)
- at com.google.inject.Scopes$1$1.get(Scopes.java:65)
- at com.google.inject.internal.InternalFactoryToProviderAdapter.get(InternalFactoryToProviderAdapter.java:40)
- at com.google.inject.int
<TRUNCATED>
[10/24] git commit: [maven-release-plugin] prepare release
simpleapp-archetype-1.7.0-RC1
Posted by da...@apache.org.
[maven-release-plugin] prepare release simpleapp-archetype-1.7.0-RC1
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/7156ba2c
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/7156ba2c
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/7156ba2c
Branch: refs/heads/master
Commit: 7156ba2cd697850028a55adb59ea0c1d551f6fc8
Parents: dc439fd
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Oct 13 23:22:24 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Oct 13 23:22:24 2014 +0100
----------------------------------------------------------------------
example/archetype/simpleapp/pom.xml | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/7156ba2c/example/archetype/simpleapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/pom.xml b/example/archetype/simpleapp/pom.xml
index 7109292..1acc700 100644
--- a/example/archetype/simpleapp/pom.xml
+++ b/example/archetype/simpleapp/pom.xml
@@ -17,11 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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.archetype</groupId>
<artifactId>simpleapp-archetype</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<packaging>maven-archetype</packaging>
<name>simpleapp-archetype</name>
<build>
@@ -47,4 +47,8 @@
<version>1.7.0</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
+
+ <scm>
+ <tag>simpleapp-archetype-1.7.0-RC1</tag>
+ </scm>
</project>
[05/24] git commit: ISIS-872: wicket viewer release, update pom,
missing license headers
Posted by da...@apache.org.
ISIS-872: wicket viewer release, update pom, missing license headers
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/b0bbaefa
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/b0bbaefa
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/b0bbaefa
Branch: refs/heads/master
Commit: b0bbaefad55408c96b6cedc94d0c6f11f2f22f9d
Parents: 9c4f5c2
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Oct 13 22:00:50 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Oct 13 22:00:50 2014 +0100
----------------------------------------------------------------------
.../imagecache/ImageResourceCacheKeyTest.java | 18 ++++++++++++++++++
component/viewer/wicket/pom.xml | 2 +-
component/viewer/wicket/tck/pom.xml | 2 +-
.../viewer/wicket/ui/errors/JGrowlUtilTest.java | 18 ++++++++++++++++++
.../viewer/wicket/ui/pages/PageAbstractTest.java | 18 ++++++++++++++++++
5 files changed, 56 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/b0bbaefa/component/viewer/wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheKeyTest.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheKeyTest.java b/component/viewer/wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheKeyTest.java
index dcd8e50..90c95e6 100644
--- a/component/viewer/wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheKeyTest.java
+++ b/component/viewer/wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheKeyTest.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.viewer.wicket.viewer.imagecache;
import java.util.Iterator;
http://git-wip-us.apache.org/repos/asf/isis/blob/b0bbaefa/component/viewer/wicket/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/pom.xml b/component/viewer/wicket/pom.xml
index 3cfdb5e..03ea938 100644
--- a/component/viewer/wicket/pom.xml
+++ b/component/viewer/wicket/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/isis/blob/b0bbaefa/component/viewer/wicket/tck/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/tck/pom.xml b/component/viewer/wicket/tck/pom.xml
index 12eef97..05cce33 100644
--- a/component/viewer/wicket/tck/pom.xml
+++ b/component/viewer/wicket/tck/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<relativePath>../../../../core/tck/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/isis/blob/b0bbaefa/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlUtilTest.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlUtilTest.java b/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlUtilTest.java
index 0adc7bd..4b33b6f 100644
--- a/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlUtilTest.java
+++ b/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlUtilTest.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.viewer.wicket.ui.errors;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/isis/blob/b0bbaefa/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstractTest.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstractTest.java b/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstractTest.java
index 6080681..8a354d3 100644
--- a/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstractTest.java
+++ b/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstractTest.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.viewer.wicket.ui.pages;
import org.junit.Test;
[18/24] git commit: [maven-release-plugin] prepare for next
development iteration
Posted by da...@apache.org.
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/dd955f95
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/dd955f95
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/dd955f95
Branch: refs/heads/master
Commit: dd955f9508d2570296a803faf315e2087361e879
Parents: e0b48c7
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Oct 13 23:49:01 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Oct 13 23:49:01 2014 +0100
----------------------------------------------------------------------
example/archetype/todoapp/pom.xml | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/dd955f95/example/archetype/todoapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/pom.xml b/example/archetype/todoapp/pom.xml
index c9539f8..7caf2c0 100644
--- a/example/archetype/todoapp/pom.xml
+++ b/example/archetype/todoapp/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.isis.archetype</groupId>
<artifactId>todoapp-archetype</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
<name>todoapp-archetype</name>
<build>
@@ -47,8 +47,4 @@
<version>1.7.0</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
-
- <scm>
- <tag>todoapp-archetype-1.7.0-RC1</tag>
- </scm>
</project>
[16/24] git commit: ISIS-872: removing old .log file
Posted by da...@apache.org.
ISIS-872: removing old .log file
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/f509da01
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/f509da01
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/f509da01
Branch: refs/heads/master
Commit: f509da01f12a0bd5d7b91245891de05d6c26734f
Parents: ec94051
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Oct 13 23:48:20 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Oct 13 23:48:20 2014 +0100
----------------------------------------------------------------------
.../todoapp/webapp/coverage-error.log | 1170 ------------------
1 file changed, 1170 deletions(-)
----------------------------------------------------------------------
[08/24] git commit: ISIS-872: updates to the original simpleapp
example app itself
Posted by da...@apache.org.
ISIS-872: updates to the original simpleapp example app itself
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/36431cc1
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/36431cc1
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/36431cc1
Branch: refs/heads/master
Commit: 36431cc100e6801cf08609558856196a9463f2b4
Parents: c019cd6
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Oct 13 23:10:43 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Oct 13 23:11:37 2014 +0100
----------------------------------------------------------------------
example/application/simpleapp/pom.xml | 6 +-
.../simpleapp/webapp/coverage-error.log | 585 -------------------
2 files changed, 4 insertions(+), 587 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/36431cc1/example/application/simpleapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index 62cc14f..aad6cef 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -34,8 +34,8 @@
</prerequisites>
<properties>
- <isis.version>1.7.0-SNAPSHOT</isis.version>
- <isis-viewer-wicket.version>1.7.0-SNAPSHOT</isis-viewer-wicket.version>
+ <isis.version>1.7.0</isis.version>
+ <isis-viewer-wicket.version>1.7.0</isis-viewer-wicket.version>
<!-- must be consistent with the versions defined by the JDO Objectstore -->
<datanucleus-accessplatform-jdo-rdbms.version>3.3.6</datanucleus-accessplatform-jdo-rdbms.version>
@@ -206,6 +206,8 @@
<exclude>**/.classpath</exclude>
<exclude>**/.settings/**</exclude>
<exclude>**/*.launch</exclude>
+ <exclude>**/ide/eclipse/launch/**</exclude>
+ <exclude>**/ide/intellij/launch/**</exclude>
<exclude>src/site/resources/ide/eclipse/**</exclude>
<exclude>**/rebel.xml</exclude>
http://git-wip-us.apache.org/repos/asf/isis/blob/36431cc1/example/application/simpleapp/webapp/coverage-error.log
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/coverage-error.log b/example/application/simpleapp/webapp/coverage-error.log
deleted file mode 100644
index 5b8abde..0000000
--- a/example/application/simpleapp/webapp/coverage-error.log
+++ /dev/null
@@ -1,585 +0,0 @@
-[2014.10.03 17:58:53] (Coverage): Error during class instrumentation: org.datanucleus.store.rdbms.mapping.java.LocalDateMapping
-java.lang.NullPointerException
- at com.intellij.rt.coverage.instrumentation.Instrumentator$MyClassWriter.typeInfo(Instrumentator.java:358)
- at com.intellij.rt.coverage.instrumentation.Instrumentator$MyClassWriter.getCommonSuperClass(Instrumentator.java:280)
- at org.jetbrains.org.objectweb.asm.ClassWriter.getMergedType(ClassWriter.java:1654)
- at org.jetbrains.org.objectweb.asm.Frame.merge(Frame.java:1425)
- at org.jetbrains.org.objectweb.asm.Frame.merge(Frame.java:1325)
- at org.jetbrains.org.objectweb.asm.MethodWriter.visitMaxs(MethodWriter.java:1475)
- at org.jetbrains.org.objectweb.asm.MethodVisitor.visitMaxs(MethodVisitor.java:866)
- at com.intellij.rt.coverage.instrumentation.SamplingInstrumenter$1.visitMaxs(SamplingInstrumenter.java:78)
- at org.jetbrains.org.objectweb.asm.ClassReader.readCode(ClassReader.java:1554)
- at org.jetbrains.org.objectweb.asm.ClassReader.readMethod(ClassReader.java:1017)
- at org.jetbrains.org.objectweb.asm.ClassReader.accept(ClassReader.java:693)
- at org.jetbrains.org.objectweb.asm.ClassReader.accept(ClassReader.java:506)
- at com.intellij.rt.coverage.instrumentation.Instrumentator.instrument(Instrumentator.java:177)
- at com.intellij.rt.coverage.instrumentation.Instrumentator.access$000(Instrumentator.java:25)
- at com.intellij.rt.coverage.instrumentation.Instrumentator$1.transform(Instrumentator.java:134)
- at sun.instrument.TransformerManager.transform(TransformerManager.java:188)
- at sun.instrument.InstrumentationImpl.transform(InstrumentationImpl.java:424)
- at java.lang.ClassLoader.defineClass1(Native Method)
- at java.lang.ClassLoader.defineClass(ClassLoader.java:800)
- at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:142)
- at java.net.URLClassLoader.defineClass(URLClassLoader.java:449)
- at java.net.URLClassLoader.access$100(URLClassLoader.java:71)
- at java.net.URLClassLoader$1.run(URLClassLoader.java:361)
- at java.net.URLClassLoader$1.run(URLClassLoader.java:355)
- at java.security.AccessController.doPrivileged(Native Method)
- at java.net.URLClassLoader.findClass(URLClassLoader.java:354)
- at java.lang.ClassLoader.loadClass(ClassLoader.java:425)
- at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:308)
- at java.lang.ClassLoader.loadClass(ClassLoader.java:358)
- at java.lang.Class.forName0(Native Method)
- at java.lang.Class.forName(Class.java:270)
- at org.datanucleus.ClassLoaderResolverImpl.classOrNull(ClassLoaderResolverImpl.java:517)
- at org.datanucleus.ClassLoaderResolverImpl.classForName(ClassLoaderResolverImpl.java:186)
- at org.datanucleus.plugin.NonManagedPluginRegistry.loadClass(NonManagedPluginRegistry.java:643)
- at org.datanucleus.plugin.PluginManager.loadClass(PluginManager.java:341)
- at org.datanucleus.store.rdbms.mapping.MappedTypeManager.addMappedType(MappedTypeManager.java:237)
- at org.datanucleus.store.rdbms.mapping.MappedTypeManager.loadMappings(MappedTypeManager.java:170)
- at org.datanucleus.store.rdbms.mapping.MappedTypeManager.<init>(MappedTypeManager.java:61)
- at org.datanucleus.store.rdbms.RDBMSStoreManager.<init>(RDBMSStoreManager.java:288)
- at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)
- at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:57)
- at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45)
- at java.lang.reflect.Constructor.newInstance(Constructor.java:526)
- at org.datanucleus.plugin.NonManagedPluginRegistry.createExecutableExtension(NonManagedPluginRegistry.java:631)
- at org.datanucleus.plugin.PluginManager.createExecutableExtension(PluginManager.java:301)
- at org.datanucleus.NucleusContext.createStoreManagerForProperties(NucleusContext.java:1245)
- at org.datanucleus.NucleusContext.initialise(NucleusContext.java:356)
- at org.datanucleus.api.jdo.JDOPersistenceManagerFactory.freezeConfiguration(JDOPersistenceManagerFactory.java:775)
- at org.datanucleus.api.jdo.JDOPersistenceManagerFactory.createPersistenceManagerFactory(JDOPersistenceManagerFactory.java:333)
- at org.datanucleus.api.jdo.JDOPersistenceManagerFactory.getPersistenceManagerFactory(JDOPersistenceManagerFactory.java:202)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:606)
- at javax.jdo.JDOHelper$16.run(JDOHelper.java:1970)
- at java.security.AccessController.doPrivileged(Native Method)
- at javax.jdo.JDOHelper.invoke(JDOHelper.java:1965)
- at javax.jdo.JDOHelper.invokeGetPersistenceManagerFactoryOnImplementation(JDOHelper.java:1171)
- at javax.jdo.JDOHelper.getPersistenceManagerFactory(JDOHelper.java:813)
- at javax.jdo.JDOHelper.getPersistenceManagerFactory(JDOHelper.java:702)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusApplicationComponents.init(DataNucleusApplicationComponents.java:107)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusApplicationComponents.<init>(DataNucleusApplicationComponents.java:97)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusPersistenceMechanismInstaller.createDataNucleusApplicationComponentsIfRequired(DataNucleusPersistenceMechanismInstaller.java:127)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusPersistenceMechanismInstaller.createObjectStore(DataNucleusPersistenceMechanismInstaller.java:110)
- at org.apache.isis.core.runtime.installerregistry.installerapi.PersistenceMechanismInstallerAbstract.createPersistenceSession(PersistenceMechanismInstallerAbstract.java:138)
- at org.apache.isis.core.runtime.persistence.PersistenceSessionFactoryDelegating.createPersistenceSession(PersistenceSessionFactoryDelegating.java:97)
- at org.apache.isis.core.runtime.system.session.IsisSessionFactoryDefault.openSession(IsisSessionFactoryDefault.java:235)
- at org.apache.isis.core.runtime.system.context.IsisContextThreadLocal.openSessionInstance(IsisContextThreadLocal.java:149)
- at org.apache.isis.core.runtime.system.context.IsisContext.openSession(IsisContext.java:279)
- at org.apache.isis.core.runtime.system.IsisSystemFixturesHookAbstract.initializeServices(IsisSystemFixturesHookAbstract.java:178)
- at org.apache.isis.core.runtime.system.IsisSystemFixturesHookAbstract.init(IsisSystemFixturesHookAbstract.java:142)
- at org.apache.isis.core.runtime.runner.IsisInjectModule.provideIsisSystem(IsisInjectModule.java:136)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:606)
- at com.google.inject.internal.ProviderMethod.get(ProviderMethod.java:104)
- at com.google.inject.internal.InternalFactoryToProviderAdapter.get(InternalFactoryToProviderAdapter.java:40)
- at com.google.inject.internal.ProviderToInternalFactoryAdapter$1.call(ProviderToInternalFactoryAdapter.java:46)
- at com.google.inject.internal.InjectorImpl.callInContext(InjectorImpl.java:1031)
- at com.google.inject.internal.ProviderToInternalFactoryAdapter.get(ProviderToInternalFactoryAdapter.java:40)
- at com.google.inject.Scopes$1$1.get(Scopes.java:65)
- at com.google.inject.internal.InternalFactoryToProviderAdapter.get(InternalFactoryToProviderAdapter.java:40)
- at com.google.inject.internal.SingleFieldInjector.inject(SingleFieldInjector.java:53)
- at com.google.inject.internal.MembersInjectorImpl.injectMembers(MembersInjectorImpl.java:110)
- at com.google.inject.internal.MembersInjectorImpl$1.call(MembersInjectorImpl.java:75)
- at com.google.inject.internal.MembersInjectorImpl$1.call(MembersInjectorImpl.java:73)
- at com.google.inject.internal.InjectorImpl.callInContext(InjectorImpl.java:1024)
- at com.google.inject.internal.MembersInjectorImpl.injectAndNotify(MembersInjectorImpl.java:73)
- at com.google.inject.internal.MembersInjectorImpl.injectMembers(MembersInjectorImpl.java:60)
- at com.google.inject.internal.InjectorImpl.injectMembers(InjectorImpl.java:944)
- at org.apache.isis.viewer.wicket.viewer.IsisWicketApplication.init(IsisWicketApplication.java:229)
- at org.apache.wicket.Application.initApplication(Application.java:823)
- at org.apache.wicket.protocol.http.WicketFilter.init(WicketFilter.java:424)
- at org.apache.wicket.protocol.http.WicketFilter.init(WicketFilter.java:351)
- at org.mortbay.jetty.servlet.FilterHolder.doStart(FilterHolder.java:97)
- at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:50)
- at org.mortbay.jetty.servlet.ServletHandler.initialize(ServletHandler.java:713)
- at org.mortbay.jetty.servlet.Context.startContext(Context.java:140)
- at org.mortbay.jetty.webapp.WebAppContext.startContext(WebAppContext.java:1282)
- at org.mortbay.jetty.handler.ContextHandler.doStart(ContextHandler.java:518)
- at org.mortbay.jetty.webapp.WebAppContext.doStart(WebAppContext.java:499)
- at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:50)
- at org.mortbay.jetty.handler.HandlerWrapper.doStart(HandlerWrapper.java:130)
- at org.mortbay.jetty.Server.doStart(Server.java:224)
- at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:50)
- at org.apache.isis.core.webserver.WebServerBootstrapper.bootstrap(WebServerBootstrapper.java:93)
- at org.apache.isis.core.webserver.WebServer.run(WebServer.java:92)
- at org.apache.isis.core.webserver.WebServer.main(WebServer.java:68)
- at org.apache.isis.WebServer.main(WebServer.java:25)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:606)
- at com.intellij.rt.execution.application.AppMain.main(AppMain.java:134)
-[2014.10.03 17:58:53] (Coverage): Error during class instrumentation: org.datanucleus.store.rdbms.mapping.java.LocalDateTimeMapping
-java.lang.NullPointerException
- at com.intellij.rt.coverage.instrumentation.Instrumentator$MyClassWriter.typeInfo(Instrumentator.java:358)
- at com.intellij.rt.coverage.instrumentation.Instrumentator$MyClassWriter.getCommonSuperClass(Instrumentator.java:280)
- at org.jetbrains.org.objectweb.asm.ClassWriter.getMergedType(ClassWriter.java:1654)
- at org.jetbrains.org.objectweb.asm.Frame.merge(Frame.java:1425)
- at org.jetbrains.org.objectweb.asm.Frame.merge(Frame.java:1325)
- at org.jetbrains.org.objectweb.asm.MethodWriter.visitMaxs(MethodWriter.java:1475)
- at org.jetbrains.org.objectweb.asm.MethodVisitor.visitMaxs(MethodVisitor.java:866)
- at com.intellij.rt.coverage.instrumentation.SamplingInstrumenter$1.visitMaxs(SamplingInstrumenter.java:78)
- at org.jetbrains.org.objectweb.asm.ClassReader.readCode(ClassReader.java:1554)
- at org.jetbrains.org.objectweb.asm.ClassReader.readMethod(ClassReader.java:1017)
- at org.jetbrains.org.objectweb.asm.ClassReader.accept(ClassReader.java:693)
- at org.jetbrains.org.objectweb.asm.ClassReader.accept(ClassReader.java:506)
- at com.intellij.rt.coverage.instrumentation.Instrumentator.instrument(Instrumentator.java:177)
- at com.intellij.rt.coverage.instrumentation.Instrumentator.access$000(Instrumentator.java:25)
- at com.intellij.rt.coverage.instrumentation.Instrumentator$1.transform(Instrumentator.java:134)
- at sun.instrument.TransformerManager.transform(TransformerManager.java:188)
- at sun.instrument.InstrumentationImpl.transform(InstrumentationImpl.java:424)
- at java.lang.ClassLoader.defineClass1(Native Method)
- at java.lang.ClassLoader.defineClass(ClassLoader.java:800)
- at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:142)
- at java.net.URLClassLoader.defineClass(URLClassLoader.java:449)
- at java.net.URLClassLoader.access$100(URLClassLoader.java:71)
- at java.net.URLClassLoader$1.run(URLClassLoader.java:361)
- at java.net.URLClassLoader$1.run(URLClassLoader.java:355)
- at java.security.AccessController.doPrivileged(Native Method)
- at java.net.URLClassLoader.findClass(URLClassLoader.java:354)
- at java.lang.ClassLoader.loadClass(ClassLoader.java:425)
- at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:308)
- at java.lang.ClassLoader.loadClass(ClassLoader.java:358)
- at java.lang.Class.forName0(Native Method)
- at java.lang.Class.forName(Class.java:270)
- at org.datanucleus.ClassLoaderResolverImpl.classOrNull(ClassLoaderResolverImpl.java:517)
- at org.datanucleus.ClassLoaderResolverImpl.classForName(ClassLoaderResolverImpl.java:186)
- at org.datanucleus.plugin.NonManagedPluginRegistry.loadClass(NonManagedPluginRegistry.java:643)
- at org.datanucleus.plugin.PluginManager.loadClass(PluginManager.java:341)
- at org.datanucleus.store.rdbms.mapping.MappedTypeManager.addMappedType(MappedTypeManager.java:237)
- at org.datanucleus.store.rdbms.mapping.MappedTypeManager.loadMappings(MappedTypeManager.java:170)
- at org.datanucleus.store.rdbms.mapping.MappedTypeManager.<init>(MappedTypeManager.java:61)
- at org.datanucleus.store.rdbms.RDBMSStoreManager.<init>(RDBMSStoreManager.java:288)
- at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)
- at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:57)
- at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45)
- at java.lang.reflect.Constructor.newInstance(Constructor.java:526)
- at org.datanucleus.plugin.NonManagedPluginRegistry.createExecutableExtension(NonManagedPluginRegistry.java:631)
- at org.datanucleus.plugin.PluginManager.createExecutableExtension(PluginManager.java:301)
- at org.datanucleus.NucleusContext.createStoreManagerForProperties(NucleusContext.java:1245)
- at org.datanucleus.NucleusContext.initialise(NucleusContext.java:356)
- at org.datanucleus.api.jdo.JDOPersistenceManagerFactory.freezeConfiguration(JDOPersistenceManagerFactory.java:775)
- at org.datanucleus.api.jdo.JDOPersistenceManagerFactory.createPersistenceManagerFactory(JDOPersistenceManagerFactory.java:333)
- at org.datanucleus.api.jdo.JDOPersistenceManagerFactory.getPersistenceManagerFactory(JDOPersistenceManagerFactory.java:202)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:606)
- at javax.jdo.JDOHelper$16.run(JDOHelper.java:1970)
- at java.security.AccessController.doPrivileged(Native Method)
- at javax.jdo.JDOHelper.invoke(JDOHelper.java:1965)
- at javax.jdo.JDOHelper.invokeGetPersistenceManagerFactoryOnImplementation(JDOHelper.java:1171)
- at javax.jdo.JDOHelper.getPersistenceManagerFactory(JDOHelper.java:813)
- at javax.jdo.JDOHelper.getPersistenceManagerFactory(JDOHelper.java:702)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusApplicationComponents.init(DataNucleusApplicationComponents.java:107)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusApplicationComponents.<init>(DataNucleusApplicationComponents.java:97)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusPersistenceMechanismInstaller.createDataNucleusApplicationComponentsIfRequired(DataNucleusPersistenceMechanismInstaller.java:127)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusPersistenceMechanismInstaller.createObjectStore(DataNucleusPersistenceMechanismInstaller.java:110)
- at org.apache.isis.core.runtime.installerregistry.installerapi.PersistenceMechanismInstallerAbstract.createPersistenceSession(PersistenceMechanismInstallerAbstract.java:138)
- at org.apache.isis.core.runtime.persistence.PersistenceSessionFactoryDelegating.createPersistenceSession(PersistenceSessionFactoryDelegating.java:97)
- at org.apache.isis.core.runtime.system.session.IsisSessionFactoryDefault.openSession(IsisSessionFactoryDefault.java:235)
- at org.apache.isis.core.runtime.system.context.IsisContextThreadLocal.openSessionInstance(IsisContextThreadLocal.java:149)
- at org.apache.isis.core.runtime.system.context.IsisContext.openSession(IsisContext.java:279)
- at org.apache.isis.core.runtime.system.IsisSystemFixturesHookAbstract.initializeServices(IsisSystemFixturesHookAbstract.java:178)
- at org.apache.isis.core.runtime.system.IsisSystemFixturesHookAbstract.init(IsisSystemFixturesHookAbstract.java:142)
- at org.apache.isis.core.runtime.runner.IsisInjectModule.provideIsisSystem(IsisInjectModule.java:136)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:606)
- at com.google.inject.internal.ProviderMethod.get(ProviderMethod.java:104)
- at com.google.inject.internal.InternalFactoryToProviderAdapter.get(InternalFactoryToProviderAdapter.java:40)
- at com.google.inject.internal.ProviderToInternalFactoryAdapter$1.call(ProviderToInternalFactoryAdapter.java:46)
- at com.google.inject.internal.InjectorImpl.callInContext(InjectorImpl.java:1031)
- at com.google.inject.internal.ProviderToInternalFactoryAdapter.get(ProviderToInternalFactoryAdapter.java:40)
- at com.google.inject.Scopes$1$1.get(Scopes.java:65)
- at com.google.inject.internal.InternalFactoryToProviderAdapter.get(InternalFactoryToProviderAdapter.java:40)
- at com.google.inject.internal.SingleFieldInjector.inject(SingleFieldInjector.java:53)
- at com.google.inject.internal.MembersInjectorImpl.injectMembers(MembersInjectorImpl.java:110)
- at com.google.inject.internal.MembersInjectorImpl$1.call(MembersInjectorImpl.java:75)
- at com.google.inject.internal.MembersInjectorImpl$1.call(MembersInjectorImpl.java:73)
- at com.google.inject.internal.InjectorImpl.callInContext(InjectorImpl.java:1024)
- at com.google.inject.internal.MembersInjectorImpl.injectAndNotify(MembersInjectorImpl.java:73)
- at com.google.inject.internal.MembersInjectorImpl.injectMembers(MembersInjectorImpl.java:60)
- at com.google.inject.internal.InjectorImpl.injectMembers(InjectorImpl.java:944)
- at org.apache.isis.viewer.wicket.viewer.IsisWicketApplication.init(IsisWicketApplication.java:229)
- at org.apache.wicket.Application.initApplication(Application.java:823)
- at org.apache.wicket.protocol.http.WicketFilter.init(WicketFilter.java:424)
- at org.apache.wicket.protocol.http.WicketFilter.init(WicketFilter.java:351)
- at org.mortbay.jetty.servlet.FilterHolder.doStart(FilterHolder.java:97)
- at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:50)
- at org.mortbay.jetty.servlet.ServletHandler.initialize(ServletHandler.java:713)
- at org.mortbay.jetty.servlet.Context.startContext(Context.java:140)
- at org.mortbay.jetty.webapp.WebAppContext.startContext(WebAppContext.java:1282)
- at org.mortbay.jetty.handler.ContextHandler.doStart(ContextHandler.java:518)
- at org.mortbay.jetty.webapp.WebAppContext.doStart(WebAppContext.java:499)
- at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:50)
- at org.mortbay.jetty.handler.HandlerWrapper.doStart(HandlerWrapper.java:130)
- at org.mortbay.jetty.Server.doStart(Server.java:224)
- at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:50)
- at org.apache.isis.core.webserver.WebServerBootstrapper.bootstrap(WebServerBootstrapper.java:93)
- at org.apache.isis.core.webserver.WebServer.run(WebServer.java:92)
- at org.apache.isis.core.webserver.WebServer.main(WebServer.java:68)
- at org.apache.isis.WebServer.main(WebServer.java:25)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:606)
- at com.intellij.rt.execution.application.AppMain.main(AppMain.java:134)
-[2014.10.03 17:58:53] (Coverage): Error during class instrumentation: org.datanucleus.store.rdbms.mapping.java.LocalTimeMapping
-java.lang.NullPointerException
- at com.intellij.rt.coverage.instrumentation.Instrumentator$MyClassWriter.typeInfo(Instrumentator.java:358)
- at com.intellij.rt.coverage.instrumentation.Instrumentator$MyClassWriter.getCommonSuperClass(Instrumentator.java:280)
- at org.jetbrains.org.objectweb.asm.ClassWriter.getMergedType(ClassWriter.java:1654)
- at org.jetbrains.org.objectweb.asm.Frame.merge(Frame.java:1425)
- at org.jetbrains.org.objectweb.asm.Frame.merge(Frame.java:1325)
- at org.jetbrains.org.objectweb.asm.MethodWriter.visitMaxs(MethodWriter.java:1475)
- at org.jetbrains.org.objectweb.asm.MethodVisitor.visitMaxs(MethodVisitor.java:866)
- at com.intellij.rt.coverage.instrumentation.SamplingInstrumenter$1.visitMaxs(SamplingInstrumenter.java:78)
- at org.jetbrains.org.objectweb.asm.ClassReader.readCode(ClassReader.java:1554)
- at org.jetbrains.org.objectweb.asm.ClassReader.readMethod(ClassReader.java:1017)
- at org.jetbrains.org.objectweb.asm.ClassReader.accept(ClassReader.java:693)
- at org.jetbrains.org.objectweb.asm.ClassReader.accept(ClassReader.java:506)
- at com.intellij.rt.coverage.instrumentation.Instrumentator.instrument(Instrumentator.java:177)
- at com.intellij.rt.coverage.instrumentation.Instrumentator.access$000(Instrumentator.java:25)
- at com.intellij.rt.coverage.instrumentation.Instrumentator$1.transform(Instrumentator.java:134)
- at sun.instrument.TransformerManager.transform(TransformerManager.java:188)
- at sun.instrument.InstrumentationImpl.transform(InstrumentationImpl.java:424)
- at java.lang.ClassLoader.defineClass1(Native Method)
- at java.lang.ClassLoader.defineClass(ClassLoader.java:800)
- at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:142)
- at java.net.URLClassLoader.defineClass(URLClassLoader.java:449)
- at java.net.URLClassLoader.access$100(URLClassLoader.java:71)
- at java.net.URLClassLoader$1.run(URLClassLoader.java:361)
- at java.net.URLClassLoader$1.run(URLClassLoader.java:355)
- at java.security.AccessController.doPrivileged(Native Method)
- at java.net.URLClassLoader.findClass(URLClassLoader.java:354)
- at java.lang.ClassLoader.loadClass(ClassLoader.java:425)
- at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:308)
- at java.lang.ClassLoader.loadClass(ClassLoader.java:358)
- at java.lang.Class.forName0(Native Method)
- at java.lang.Class.forName(Class.java:270)
- at org.datanucleus.ClassLoaderResolverImpl.classOrNull(ClassLoaderResolverImpl.java:517)
- at org.datanucleus.ClassLoaderResolverImpl.classForName(ClassLoaderResolverImpl.java:186)
- at org.datanucleus.plugin.NonManagedPluginRegistry.loadClass(NonManagedPluginRegistry.java:643)
- at org.datanucleus.plugin.PluginManager.loadClass(PluginManager.java:341)
- at org.datanucleus.store.rdbms.mapping.MappedTypeManager.addMappedType(MappedTypeManager.java:237)
- at org.datanucleus.store.rdbms.mapping.MappedTypeManager.loadMappings(MappedTypeManager.java:170)
- at org.datanucleus.store.rdbms.mapping.MappedTypeManager.<init>(MappedTypeManager.java:61)
- at org.datanucleus.store.rdbms.RDBMSStoreManager.<init>(RDBMSStoreManager.java:288)
- at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)
- at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:57)
- at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45)
- at java.lang.reflect.Constructor.newInstance(Constructor.java:526)
- at org.datanucleus.plugin.NonManagedPluginRegistry.createExecutableExtension(NonManagedPluginRegistry.java:631)
- at org.datanucleus.plugin.PluginManager.createExecutableExtension(PluginManager.java:301)
- at org.datanucleus.NucleusContext.createStoreManagerForProperties(NucleusContext.java:1245)
- at org.datanucleus.NucleusContext.initialise(NucleusContext.java:356)
- at org.datanucleus.api.jdo.JDOPersistenceManagerFactory.freezeConfiguration(JDOPersistenceManagerFactory.java:775)
- at org.datanucleus.api.jdo.JDOPersistenceManagerFactory.createPersistenceManagerFactory(JDOPersistenceManagerFactory.java:333)
- at org.datanucleus.api.jdo.JDOPersistenceManagerFactory.getPersistenceManagerFactory(JDOPersistenceManagerFactory.java:202)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:606)
- at javax.jdo.JDOHelper$16.run(JDOHelper.java:1970)
- at java.security.AccessController.doPrivileged(Native Method)
- at javax.jdo.JDOHelper.invoke(JDOHelper.java:1965)
- at javax.jdo.JDOHelper.invokeGetPersistenceManagerFactoryOnImplementation(JDOHelper.java:1171)
- at javax.jdo.JDOHelper.getPersistenceManagerFactory(JDOHelper.java:813)
- at javax.jdo.JDOHelper.getPersistenceManagerFactory(JDOHelper.java:702)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusApplicationComponents.init(DataNucleusApplicationComponents.java:107)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusApplicationComponents.<init>(DataNucleusApplicationComponents.java:97)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusPersistenceMechanismInstaller.createDataNucleusApplicationComponentsIfRequired(DataNucleusPersistenceMechanismInstaller.java:127)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusPersistenceMechanismInstaller.createObjectStore(DataNucleusPersistenceMechanismInstaller.java:110)
- at org.apache.isis.core.runtime.installerregistry.installerapi.PersistenceMechanismInstallerAbstract.createPersistenceSession(PersistenceMechanismInstallerAbstract.java:138)
- at org.apache.isis.core.runtime.persistence.PersistenceSessionFactoryDelegating.createPersistenceSession(PersistenceSessionFactoryDelegating.java:97)
- at org.apache.isis.core.runtime.system.session.IsisSessionFactoryDefault.openSession(IsisSessionFactoryDefault.java:235)
- at org.apache.isis.core.runtime.system.context.IsisContextThreadLocal.openSessionInstance(IsisContextThreadLocal.java:149)
- at org.apache.isis.core.runtime.system.context.IsisContext.openSession(IsisContext.java:279)
- at org.apache.isis.core.runtime.system.IsisSystemFixturesHookAbstract.initializeServices(IsisSystemFixturesHookAbstract.java:178)
- at org.apache.isis.core.runtime.system.IsisSystemFixturesHookAbstract.init(IsisSystemFixturesHookAbstract.java:142)
- at org.apache.isis.core.runtime.runner.IsisInjectModule.provideIsisSystem(IsisInjectModule.java:136)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:606)
- at com.google.inject.internal.ProviderMethod.get(ProviderMethod.java:104)
- at com.google.inject.internal.InternalFactoryToProviderAdapter.get(InternalFactoryToProviderAdapter.java:40)
- at com.google.inject.internal.ProviderToInternalFactoryAdapter$1.call(ProviderToInternalFactoryAdapter.java:46)
- at com.google.inject.internal.InjectorImpl.callInContext(InjectorImpl.java:1031)
- at com.google.inject.internal.ProviderToInternalFactoryAdapter.get(ProviderToInternalFactoryAdapter.java:40)
- at com.google.inject.Scopes$1$1.get(Scopes.java:65)
- at com.google.inject.internal.InternalFactoryToProviderAdapter.get(InternalFactoryToProviderAdapter.java:40)
- at com.google.inject.internal.SingleFieldInjector.inject(SingleFieldInjector.java:53)
- at com.google.inject.internal.MembersInjectorImpl.injectMembers(MembersInjectorImpl.java:110)
- at com.google.inject.internal.MembersInjectorImpl$1.call(MembersInjectorImpl.java:75)
- at com.google.inject.internal.MembersInjectorImpl$1.call(MembersInjectorImpl.java:73)
- at com.google.inject.internal.InjectorImpl.callInContext(InjectorImpl.java:1024)
- at com.google.inject.internal.MembersInjectorImpl.injectAndNotify(MembersInjectorImpl.java:73)
- at com.google.inject.internal.MembersInjectorImpl.injectMembers(MembersInjectorImpl.java:60)
- at com.google.inject.internal.InjectorImpl.injectMembers(InjectorImpl.java:944)
- at org.apache.isis.viewer.wicket.viewer.IsisWicketApplication.init(IsisWicketApplication.java:229)
- at org.apache.wicket.Application.initApplication(Application.java:823)
- at org.apache.wicket.protocol.http.WicketFilter.init(WicketFilter.java:424)
- at org.apache.wicket.protocol.http.WicketFilter.init(WicketFilter.java:351)
- at org.mortbay.jetty.servlet.FilterHolder.doStart(FilterHolder.java:97)
- at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:50)
- at org.mortbay.jetty.servlet.ServletHandler.initialize(ServletHandler.java:713)
- at org.mortbay.jetty.servlet.Context.startContext(Context.java:140)
- at org.mortbay.jetty.webapp.WebAppContext.startContext(WebAppContext.java:1282)
- at org.mortbay.jetty.handler.ContextHandler.doStart(ContextHandler.java:518)
- at org.mortbay.jetty.webapp.WebAppContext.doStart(WebAppContext.java:499)
- at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:50)
- at org.mortbay.jetty.handler.HandlerWrapper.doStart(HandlerWrapper.java:130)
- at org.mortbay.jetty.Server.doStart(Server.java:224)
- at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:50)
- at org.apache.isis.core.webserver.WebServerBootstrapper.bootstrap(WebServerBootstrapper.java:93)
- at org.apache.isis.core.webserver.WebServer.run(WebServer.java:92)
- at org.apache.isis.core.webserver.WebServer.main(WebServer.java:68)
- at org.apache.isis.WebServer.main(WebServer.java:25)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:606)
- at com.intellij.rt.execution.application.AppMain.main(AppMain.java:134)
-[2014.10.03 17:58:54] (Coverage): Error during class instrumentation: org.datanucleus.store.rdbms.mapping.oracle.OracleClobRDBMSMapping
-java.lang.NullPointerException
- at com.intellij.rt.coverage.instrumentation.Instrumentator$MyClassWriter.typeInfo(Instrumentator.java:358)
- at com.intellij.rt.coverage.instrumentation.Instrumentator$MyClassWriter.getCommonSuperClass(Instrumentator.java:279)
- at org.jetbrains.org.objectweb.asm.ClassWriter.getMergedType(ClassWriter.java:1654)
- at org.jetbrains.org.objectweb.asm.Frame.merge(Frame.java:1425)
- at org.jetbrains.org.objectweb.asm.Frame.merge(Frame.java:1325)
- at org.jetbrains.org.objectweb.asm.MethodWriter.visitMaxs(MethodWriter.java:1475)
- at org.jetbrains.org.objectweb.asm.MethodVisitor.visitMaxs(MethodVisitor.java:866)
- at com.intellij.rt.coverage.instrumentation.SamplingInstrumenter$1.visitMaxs(SamplingInstrumenter.java:78)
- at org.jetbrains.org.objectweb.asm.ClassReader.readCode(ClassReader.java:1554)
- at org.jetbrains.org.objectweb.asm.ClassReader.readMethod(ClassReader.java:1017)
- at org.jetbrains.org.objectweb.asm.ClassReader.accept(ClassReader.java:693)
- at org.jetbrains.org.objectweb.asm.ClassReader.accept(ClassReader.java:506)
- at com.intellij.rt.coverage.instrumentation.Instrumentator.instrument(Instrumentator.java:177)
- at com.intellij.rt.coverage.instrumentation.Instrumentator.access$000(Instrumentator.java:25)
- at com.intellij.rt.coverage.instrumentation.Instrumentator$1.transform(Instrumentator.java:134)
- at sun.instrument.TransformerManager.transform(TransformerManager.java:188)
- at sun.instrument.InstrumentationImpl.transform(InstrumentationImpl.java:424)
- at java.lang.ClassLoader.defineClass1(Native Method)
- at java.lang.ClassLoader.defineClass(ClassLoader.java:800)
- at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:142)
- at java.net.URLClassLoader.defineClass(URLClassLoader.java:449)
- at java.net.URLClassLoader.access$100(URLClassLoader.java:71)
- at java.net.URLClassLoader$1.run(URLClassLoader.java:361)
- at java.net.URLClassLoader$1.run(URLClassLoader.java:355)
- at java.security.AccessController.doPrivileged(Native Method)
- at java.net.URLClassLoader.findClass(URLClassLoader.java:354)
- at java.lang.ClassLoader.loadClass(ClassLoader.java:425)
- at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:308)
- at java.lang.ClassLoader.loadClass(ClassLoader.java:358)
- at java.lang.Class.forName0(Native Method)
- at java.lang.Class.forName(Class.java:270)
- at org.datanucleus.ClassLoaderResolverImpl.classOrNull(ClassLoaderResolverImpl.java:517)
- at org.datanucleus.ClassLoaderResolverImpl.classForName(ClassLoaderResolverImpl.java:186)
- at org.datanucleus.plugin.NonManagedPluginRegistry.loadClass(NonManagedPluginRegistry.java:643)
- at org.datanucleus.plugin.PluginManager.loadClass(PluginManager.java:341)
- at org.datanucleus.store.rdbms.mapping.RDBMSMappingManager.loadDatastoreMapping(RDBMSMappingManager.java:175)
- at org.datanucleus.store.rdbms.adapter.BaseDatastoreAdapter.initialiseTypes(BaseDatastoreAdapter.java:448)
- at org.datanucleus.store.rdbms.adapter.HSQLAdapter.initialiseTypes(HSQLAdapter.java:133)
- at org.datanucleus.store.rdbms.RDBMSStoreManager.<init>(RDBMSStoreManager.java:312)
- at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)
- at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:57)
- at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45)
- at java.lang.reflect.Constructor.newInstance(Constructor.java:526)
- at org.datanucleus.plugin.NonManagedPluginRegistry.createExecutableExtension(NonManagedPluginRegistry.java:631)
- at org.datanucleus.plugin.PluginManager.createExecutableExtension(PluginManager.java:301)
- at org.datanucleus.NucleusContext.createStoreManagerForProperties(NucleusContext.java:1245)
- at org.datanucleus.NucleusContext.initialise(NucleusContext.java:356)
- at org.datanucleus.api.jdo.JDOPersistenceManagerFactory.freezeConfiguration(JDOPersistenceManagerFactory.java:775)
- at org.datanucleus.api.jdo.JDOPersistenceManagerFactory.createPersistenceManagerFactory(JDOPersistenceManagerFactory.java:333)
- at org.datanucleus.api.jdo.JDOPersistenceManagerFactory.getPersistenceManagerFactory(JDOPersistenceManagerFactory.java:202)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:606)
- at javax.jdo.JDOHelper$16.run(JDOHelper.java:1970)
- at java.security.AccessController.doPrivileged(Native Method)
- at javax.jdo.JDOHelper.invoke(JDOHelper.java:1965)
- at javax.jdo.JDOHelper.invokeGetPersistenceManagerFactoryOnImplementation(JDOHelper.java:1171)
- at javax.jdo.JDOHelper.getPersistenceManagerFactory(JDOHelper.java:813)
- at javax.jdo.JDOHelper.getPersistenceManagerFactory(JDOHelper.java:702)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusApplicationComponents.init(DataNucleusApplicationComponents.java:107)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusApplicationComponents.<init>(DataNucleusApplicationComponents.java:97)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusPersistenceMechanismInstaller.createDataNucleusApplicationComponentsIfRequired(DataNucleusPersistenceMechanismInstaller.java:127)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusPersistenceMechanismInstaller.createObjectStore(DataNucleusPersistenceMechanismInstaller.java:110)
- at org.apache.isis.core.runtime.installerregistry.installerapi.PersistenceMechanismInstallerAbstract.createPersistenceSession(PersistenceMechanismInstallerAbstract.java:138)
- at org.apache.isis.core.runtime.persistence.PersistenceSessionFactoryDelegating.createPersistenceSession(PersistenceSessionFactoryDelegating.java:97)
- at org.apache.isis.core.runtime.system.session.IsisSessionFactoryDefault.openSession(IsisSessionFactoryDefault.java:235)
- at org.apache.isis.core.runtime.system.context.IsisContextThreadLocal.openSessionInstance(IsisContextThreadLocal.java:149)
- at org.apache.isis.core.runtime.system.context.IsisContext.openSession(IsisContext.java:279)
- at org.apache.isis.core.runtime.system.IsisSystemFixturesHookAbstract.initializeServices(IsisSystemFixturesHookAbstract.java:178)
- at org.apache.isis.core.runtime.system.IsisSystemFixturesHookAbstract.init(IsisSystemFixturesHookAbstract.java:142)
- at org.apache.isis.core.runtime.runner.IsisInjectModule.provideIsisSystem(IsisInjectModule.java:136)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:606)
- at com.google.inject.internal.ProviderMethod.get(ProviderMethod.java:104)
- at com.google.inject.internal.InternalFactoryToProviderAdapter.get(InternalFactoryToProviderAdapter.java:40)
- at com.google.inject.internal.ProviderToInternalFactoryAdapter$1.call(ProviderToInternalFactoryAdapter.java:46)
- at com.google.inject.internal.InjectorImpl.callInContext(InjectorImpl.java:1031)
- at com.google.inject.internal.ProviderToInternalFactoryAdapter.get(ProviderToInternalFactoryAdapter.java:40)
- at com.google.inject.Scopes$1$1.get(Scopes.java:65)
- at com.google.inject.internal.InternalFactoryToProviderAdapter.get(InternalFactoryToProviderAdapter.java:40)
- at com.google.inject.internal.SingleFieldInjector.inject(SingleFieldInjector.java:53)
- at com.google.inject.internal.MembersInjectorImpl.injectMembers(MembersInjectorImpl.java:110)
- at com.google.inject.internal.MembersInjectorImpl$1.call(MembersInjectorImpl.java:75)
- at com.google.inject.internal.MembersInjectorImpl$1.call(MembersInjectorImpl.java:73)
- at com.google.inject.internal.InjectorImpl.callInContext(InjectorImpl.java:1024)
- at com.google.inject.internal.MembersInjectorImpl.injectAndNotify(MembersInjectorImpl.java:73)
- at com.google.inject.internal.MembersInjectorImpl.injectMembers(MembersInjectorImpl.java:60)
- at com.google.inject.internal.InjectorImpl.injectMembers(InjectorImpl.java:944)
- at org.apache.isis.viewer.wicket.viewer.IsisWicketApplication.init(IsisWicketApplication.java:229)
- at org.apache.wicket.Application.initApplication(Application.java:823)
- at org.apache.wicket.protocol.http.WicketFilter.init(WicketFilter.java:424)
- at org.apache.wicket.protocol.http.WicketFilter.init(WicketFilter.java:351)
- at org.mortbay.jetty.servlet.FilterHolder.doStart(FilterHolder.java:97)
- at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:50)
- at org.mortbay.jetty.servlet.ServletHandler.initialize(ServletHandler.java:713)
- at org.mortbay.jetty.servlet.Context.startContext(Context.java:140)
- at org.mortbay.jetty.webapp.WebAppContext.startContext(WebAppContext.java:1282)
- at org.mortbay.jetty.handler.ContextHandler.doStart(ContextHandler.java:518)
- at org.mortbay.jetty.webapp.WebAppContext.doStart(WebAppContext.java:499)
- at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:50)
- at org.mortbay.jetty.handler.HandlerWrapper.doStart(HandlerWrapper.java:130)
- at org.mortbay.jetty.Server.doStart(Server.java:224)
- at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:50)
- at org.apache.isis.core.webserver.WebServerBootstrapper.bootstrap(WebServerBootstrapper.java:93)
- at org.apache.isis.core.webserver.WebServer.run(WebServer.java:92)
- at org.apache.isis.core.webserver.WebServer.main(WebServer.java:68)
- at org.apache.isis.WebServer.main(WebServer.java:25)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:606)
- at com.intellij.rt.execution.application.AppMain.main(AppMain.java:134)
-[2014.10.03 17:58:54] (Coverage): Error during class instrumentation: org.datanucleus.store.rdbms.mapping.oracle.OracleBlobRDBMSMapping
-java.lang.NullPointerException
- at com.intellij.rt.coverage.instrumentation.Instrumentator$MyClassWriter.typeInfo(Instrumentator.java:358)
- at com.intellij.rt.coverage.instrumentation.Instrumentator$MyClassWriter.getCommonSuperClass(Instrumentator.java:279)
- at org.jetbrains.org.objectweb.asm.ClassWriter.getMergedType(ClassWriter.java:1654)
- at org.jetbrains.org.objectweb.asm.Frame.merge(Frame.java:1425)
- at org.jetbrains.org.objectweb.asm.Frame.merge(Frame.java:1325)
- at org.jetbrains.org.objectweb.asm.MethodWriter.visitMaxs(MethodWriter.java:1475)
- at org.jetbrains.org.objectweb.asm.MethodVisitor.visitMaxs(MethodVisitor.java:866)
- at com.intellij.rt.coverage.instrumentation.SamplingInstrumenter$1.visitMaxs(SamplingInstrumenter.java:78)
- at org.jetbrains.org.objectweb.asm.ClassReader.readCode(ClassReader.java:1554)
- at org.jetbrains.org.objectweb.asm.ClassReader.readMethod(ClassReader.java:1017)
- at org.jetbrains.org.objectweb.asm.ClassReader.accept(ClassReader.java:693)
- at org.jetbrains.org.objectweb.asm.ClassReader.accept(ClassReader.java:506)
- at com.intellij.rt.coverage.instrumentation.Instrumentator.instrument(Instrumentator.java:177)
- at com.intellij.rt.coverage.instrumentation.Instrumentator.access$000(Instrumentator.java:25)
- at com.intellij.rt.coverage.instrumentation.Instrumentator$1.transform(Instrumentator.java:134)
- at sun.instrument.TransformerManager.transform(TransformerManager.java:188)
- at sun.instrument.InstrumentationImpl.transform(InstrumentationImpl.java:424)
- at java.lang.ClassLoader.defineClass1(Native Method)
- at java.lang.ClassLoader.defineClass(ClassLoader.java:800)
- at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:142)
- at java.net.URLClassLoader.defineClass(URLClassLoader.java:449)
- at java.net.URLClassLoader.access$100(URLClassLoader.java:71)
- at java.net.URLClassLoader$1.run(URLClassLoader.java:361)
- at java.net.URLClassLoader$1.run(URLClassLoader.java:355)
- at java.security.AccessController.doPrivileged(Native Method)
- at java.net.URLClassLoader.findClass(URLClassLoader.java:354)
- at java.lang.ClassLoader.loadClass(ClassLoader.java:425)
- at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:308)
- at java.lang.ClassLoader.loadClass(ClassLoader.java:358)
- at java.lang.Class.forName0(Native Method)
- at java.lang.Class.forName(Class.java:270)
- at org.datanucleus.ClassLoaderResolverImpl.classOrNull(ClassLoaderResolverImpl.java:517)
- at org.datanucleus.ClassLoaderResolverImpl.classForName(ClassLoaderResolverImpl.java:186)
- at org.datanucleus.plugin.NonManagedPluginRegistry.loadClass(NonManagedPluginRegistry.java:643)
- at org.datanucleus.plugin.PluginManager.loadClass(PluginManager.java:341)
- at org.datanucleus.store.rdbms.mapping.RDBMSMappingManager.loadDatastoreMapping(RDBMSMappingManager.java:175)
- at org.datanucleus.store.rdbms.adapter.BaseDatastoreAdapter.initialiseTypes(BaseDatastoreAdapter.java:448)
- at org.datanucleus.store.rdbms.adapter.HSQLAdapter.initialiseTypes(HSQLAdapter.java:133)
- at org.datanucleus.store.rdbms.RDBMSStoreManager.<init>(RDBMSStoreManager.java:312)
- at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)
- at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:57)
- at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45)
- at java.lang.reflect.Constructor.newInstance(Constructor.java:526)
- at org.datanucleus.plugin.NonManagedPluginRegistry.createExecutableExtension(NonManagedPluginRegistry.java:631)
- at org.datanucleus.plugin.PluginManager.createExecutableExtension(PluginManager.java:301)
- at org.datanucleus.NucleusContext.createStoreManagerForProperties(NucleusContext.java:1245)
- at org.datanucleus.NucleusContext.initialise(NucleusContext.java:356)
- at org.datanucleus.api.jdo.JDOPersistenceManagerFactory.freezeConfiguration(JDOPersistenceManagerFactory.java:775)
- at org.datanucleus.api.jdo.JDOPersistenceManagerFactory.createPersistenceManagerFactory(JDOPersistenceManagerFactory.java:333)
- at org.datanucleus.api.jdo.JDOPersistenceManagerFactory.getPersistenceManagerFactory(JDOPersistenceManagerFactory.java:202)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:606)
- at javax.jdo.JDOHelper$16.run(JDOHelper.java:1970)
- at java.security.AccessController.doPrivileged(Native Method)
- at javax.jdo.JDOHelper.invoke(JDOHelper.java:1965)
- at javax.jdo.JDOHelper.invokeGetPersistenceManagerFactoryOnImplementation(JDOHelper.java:1171)
- at javax.jdo.JDOHelper.getPersistenceManagerFactory(JDOHelper.java:813)
- at javax.jdo.JDOHelper.getPersistenceManagerFactory(JDOHelper.java:702)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusApplicationComponents.init(DataNucleusApplicationComponents.java:107)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusApplicationComponents.<init>(DataNucleusApplicationComponents.java:97)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusPersistenceMechanismInstaller.createDataNucleusApplicationComponentsIfRequired(DataNucleusPersistenceMechanismInstaller.java:127)
- at org.apache.isis.objectstore.jdo.datanucleus.DataNucleusPersistenceMechanismInstaller.createObjectStore(DataNucleusPersistenceMechanismInstaller.java:110)
- at org.apache.isis.core.runtime.installerregistry.installerapi.PersistenceMechanismInstallerAbstract.createPersistenceSession(PersistenceMechanismInstallerAbstract.java:138)
- at org.apache.isis.core.runtime.persistence.PersistenceSessionFactoryDelegating.createPersistenceSession(PersistenceSessionFactoryDelegating.java:97)
- at org.apache.isis.core.runtime.system.session.IsisSessionFactoryDefault.openSession(IsisSessionFactoryDefault.java:235)
- at org.apache.isis.core.runtime.system.context.IsisContextThreadLocal.openSessionInstance(IsisContextThreadLocal.java:149)
- at org.apache.isis.core.runtime.system.context.IsisContext.openSession(IsisContext.java:279)
- at org.apache.isis.core.runtime.system.IsisSystemFixturesHookAbstract.initializeServices(IsisSystemFixturesHookAbstract.java:178)
- at org.apache.isis.core.runtime.system.IsisSystemFixturesHookAbstract.init(IsisSystemFixturesHookAbstract.java:142)
- at org.apache.isis.core.runtime.runner.IsisInjectModule.provideIsisSystem(IsisInjectModule.java:136)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:606)
- at com.google.inject.internal.ProviderMethod.get(ProviderMethod.java:104)
- at com.google.inject.internal.InternalFactoryToProviderAdapter.get(InternalFactoryToProviderAdapter.java:40)
- at com.google.inject.internal.ProviderToInternalFactoryAdapter$1.call(ProviderToInternalFactoryAdapter.java:46)
- at com.google.inject.internal.InjectorImpl.callInContext(InjectorImpl.java:1031)
- at com.google.inject.internal.ProviderToInternalFactoryAdapter.get(ProviderToInternalFactoryAdapter.java:40)
- at com.google.inject.Scopes$1$1.get(Scopes.java:65)
- at com.google.inject.internal.InternalFactoryToProviderAdapter.get(InternalFactoryToProviderAdapter.java:40)
- at com.google.inject.internal.SingleFieldInjector.inject(SingleFieldInjector.java:53)
- at com.google.inject.internal.MembersInjectorImpl.injectMembers(MembersInjectorImpl.java:110)
- at com.google.inject.internal.MembersInjectorImpl$1.call(MembersInjectorImpl.java:75)
- at com.google.inject.internal.MembersInjectorImpl$1.call(MembersInjectorImpl.java:73)
- at com.google.inject.internal.InjectorImpl.callInContext(InjectorImpl.java:1024)
- at com.google.inject.internal.MembersInjectorImpl.injectAndNotify(MembersInjectorImpl.java:73)
- at com.google.inject.internal.MembersInjectorImpl.injectMembers(MembersInjectorImpl.java:60)
- at com.google.inject.internal.InjectorImpl.injectMembers(InjectorImpl.java:944)
- at org.apache.isis.viewer.wicket.viewer.IsisWicketApplication.init(IsisWicketApplication.java:229)
- at org.apache.wicket.Application.initApplication(Application.java:823)
- at org.apache.wicket.protocol.http.WicketFilter.init(WicketFilter.java:424)
- at org.apache.wicket.protocol.http.WicketFilter.init(WicketFilter.java:351)
- at org.mortbay.jetty.servlet.FilterHolder.doStart(FilterHolder.java:97)
- at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:50)
- at org.mortbay.jetty.servlet.ServletHandler.initialize(ServletHandler.java:713)
- at org.mortbay.jetty.servlet.Context.startContext(Context.java:140)
- at org.mortbay.jetty.webapp.WebAppContext.startContext(WebAppContext.java:1282)
- at org.mortbay.jetty.handler.ContextHandler.doStart(ContextHandler.java:518)
- at org.mortbay.jetty.webapp.WebAppContext.doStart(WebAppContext.java:499)
- at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:50)
- at org.mortbay.jetty.handler.HandlerWrapper.doStart(HandlerWrapper.java:130)
- at org.mortbay.jetty.Server.doStart(Server.java:224)
- at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:50)
- at org.apache.isis.core.webserver.WebServerBootstrapper.bootstrap(WebServerBootstrapper.java:93)
- at org.apache.isis.core.webserver.WebServer.run(WebServer.java:92)
- at org.apache.isis.core.webserver.WebServer.main(WebServer.java:68)
- at org.apache.isis.WebServer.main(WebServer.java:25)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:606)
- at com.intellij.rt.execution.application.AppMain.main(AppMain.java:134)
[24/24] git commit: ISIS-872: post-merge fixes for various pom.xml,
bumping up to 1.8.0-SNAPSHOT.
Posted by da...@apache.org.
ISIS-872: post-merge fixes for various pom.xml, bumping up to 1.8.0-SNAPSHOT.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e8bd023e
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e8bd023e
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e8bd023e
Branch: refs/heads/master
Commit: e8bd023ee9cc531c572947a6738aaf39a713035c
Parents: 70b77f2
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sun Oct 19 12:05:12 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sun Oct 19 12:05:12 2014 +0100
----------------------------------------------------------------------
component/viewer/scimpi/pom.xml | 2 +-
component/viewer/wicket/pom.xml | 2 +-
component/viewer/wicket/tck/pom.xml | 2 +-
example/application/simpleapp/dom/pom.xml | 2 +-
example/application/simpleapp/fixture/pom.xml | 2 +-
example/application/simpleapp/integtests/pom.xml | 2 +-
example/application/simpleapp/pom.xml | 6 +++---
example/application/simpleapp/webapp/pom.xml | 2 +-
example/application/todoapp/dom/pom.xml | 2 +-
example/application/todoapp/fixture/pom.xml | 2 +-
example/application/todoapp/integtests/pom.xml | 2 +-
example/application/todoapp/pom.xml | 6 +++---
example/application/todoapp/webapp/pom.xml | 2 +-
example/archetype/simpleapp/pom.xml | 2 +-
.../simpleapp/src/main/resources/archetype-resources/pom.xml | 4 ++--
example/archetype/todoapp/pom.xml | 2 +-
.../todoapp/src/main/resources/archetype-resources/pom.xml | 4 ++--
mothballed/profilestore-inmemory/pom.xml | 2 +-
tool/maven-plugin/pom.xml | 2 +-
19 files changed, 25 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/e8bd023e/component/viewer/scimpi/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/pom.xml b/component/viewer/scimpi/pom.xml
index 40f49be..0f09051 100644
--- a/component/viewer/scimpi/pom.xml
+++ b/component/viewer/scimpi/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/isis/blob/e8bd023e/component/viewer/wicket/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/pom.xml b/component/viewer/wicket/pom.xml
index 354926f..eb5a45c 100644
--- a/component/viewer/wicket/pom.xml
+++ b/component/viewer/wicket/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/isis/blob/e8bd023e/component/viewer/wicket/tck/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/tck/pom.xml b/component/viewer/wicket/tck/pom.xml
index b4e846a..53c18b7 100644
--- a/component/viewer/wicket/tck/pom.xml
+++ b/component/viewer/wicket/tck/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
<relativePath>../../../../core/tck/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/isis/blob/e8bd023e/example/application/simpleapp/dom/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/dom/pom.xml b/example/application/simpleapp/dom/pom.xml
index 86cd659..3956909 100644
--- a/example/application/simpleapp/dom/pom.xml
+++ b/example/application/simpleapp/dom/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.example.application</groupId>
<artifactId>simpleapp</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>simpleapp-dom</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/e8bd023e/example/application/simpleapp/fixture/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/fixture/pom.xml b/example/application/simpleapp/fixture/pom.xml
index 3507441..4e9d2ed 100644
--- a/example/application/simpleapp/fixture/pom.xml
+++ b/example/application/simpleapp/fixture/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.example.application</groupId>
<artifactId>simpleapp</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>simpleapp-fixture</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/e8bd023e/example/application/simpleapp/integtests/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/integtests/pom.xml b/example/application/simpleapp/integtests/pom.xml
index d457260..6326a93 100644
--- a/example/application/simpleapp/integtests/pom.xml
+++ b/example/application/simpleapp/integtests/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.example.application</groupId>
<artifactId>simpleapp</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>simpleapp-integtests</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/e8bd023e/example/application/simpleapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index aad6cef..0b71999 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.apache.isis.example.application</groupId>
<artifactId>simpleapp</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
<name>Simple App</name>
@@ -34,8 +34,8 @@
</prerequisites>
<properties>
- <isis.version>1.7.0</isis.version>
- <isis-viewer-wicket.version>1.7.0</isis-viewer-wicket.version>
+ <isis.version>1.8.0-SNAPSHOT</isis.version>
+ <isis-viewer-wicket.version>1.8.0-SNAPSHOT</isis-viewer-wicket.version>
<!-- must be consistent with the versions defined by the JDO Objectstore -->
<datanucleus-accessplatform-jdo-rdbms.version>3.3.6</datanucleus-accessplatform-jdo-rdbms.version>
http://git-wip-us.apache.org/repos/asf/isis/blob/e8bd023e/example/application/simpleapp/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/pom.xml b/example/application/simpleapp/webapp/pom.xml
index 8849ff4..07864a1 100644
--- a/example/application/simpleapp/webapp/pom.xml
+++ b/example/application/simpleapp/webapp/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.isis.example.application</groupId>
<artifactId>simpleapp</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>simpleapp-webapp</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/e8bd023e/example/application/todoapp/dom/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/todoapp/dom/pom.xml b/example/application/todoapp/dom/pom.xml
index 8e68ba9..cd4ffc3 100644
--- a/example/application/todoapp/dom/pom.xml
+++ b/example/application/todoapp/dom/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.example.application</groupId>
<artifactId>todoapp</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>todoapp-dom</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/e8bd023e/example/application/todoapp/fixture/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/todoapp/fixture/pom.xml b/example/application/todoapp/fixture/pom.xml
index b33e5ef..8881b6e 100644
--- a/example/application/todoapp/fixture/pom.xml
+++ b/example/application/todoapp/fixture/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.example.application</groupId>
<artifactId>todoapp</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>todoapp-fixture</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/e8bd023e/example/application/todoapp/integtests/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/todoapp/integtests/pom.xml b/example/application/todoapp/integtests/pom.xml
index 05021fb..3abb7a3 100644
--- a/example/application/todoapp/integtests/pom.xml
+++ b/example/application/todoapp/integtests/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.example.application</groupId>
<artifactId>todoapp</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>todoapp-integtests</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/e8bd023e/example/application/todoapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/todoapp/pom.xml b/example/application/todoapp/pom.xml
index 71d4579..9cd3e9f 100644
--- a/example/application/todoapp/pom.xml
+++ b/example/application/todoapp/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.apache.isis.example.application</groupId>
<artifactId>todoapp</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
<name>ToDo App</name>
@@ -34,8 +34,8 @@
</prerequisites>
<properties>
- <isis.version>1.7.0</isis.version>
- <isis-viewer-wicket.version>1.7.0</isis-viewer-wicket.version>
+ <isis.version>1.8.0-SNAPSHOT</isis.version>
+ <isis-viewer-wicket.version>1.8.0-SNAPSHOT</isis-viewer-wicket.version>
<!-- must be consistent with the versions defined by the JDO Objectstore -->
<datanucleus-accessplatform-jdo-rdbms.version>3.3.6</datanucleus-accessplatform-jdo-rdbms.version>
http://git-wip-us.apache.org/repos/asf/isis/blob/e8bd023e/example/application/todoapp/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/todoapp/webapp/pom.xml b/example/application/todoapp/webapp/pom.xml
index 8d53998..07b5686 100644
--- a/example/application/todoapp/webapp/pom.xml
+++ b/example/application/todoapp/webapp/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.isis.example.application</groupId>
<artifactId>todoapp</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>todoapp-webapp</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/e8bd023e/example/archetype/simpleapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/pom.xml b/example/archetype/simpleapp/pom.xml
index d2c824a..05447c0 100644
--- a/example/archetype/simpleapp/pom.xml
+++ b/example/archetype/simpleapp/pom.xml
@@ -44,7 +44,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/e8bd023e/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
index 8b8f1f8..53398b7 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
@@ -32,8 +32,8 @@
</prerequisites>
<properties>
- <isis.version>1.7.0</isis.version>
- <isis-viewer-wicket.version>1.7.0</isis-viewer-wicket.version>
+ <isis.version>1.8.0-SNAPSHOT</isis.version>
+ <isis-viewer-wicket.version>1.8.0-SNAPSHOT</isis-viewer-wicket.version>
<!-- must be consistent with the versions defined by the JDO Objectstore -->
<datanucleus-accessplatform-jdo-rdbms.version>3.3.6</datanucleus-accessplatform-jdo-rdbms.version>
http://git-wip-us.apache.org/repos/asf/isis/blob/e8bd023e/example/archetype/todoapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/pom.xml b/example/archetype/todoapp/pom.xml
index 7caf2c0..1922cdb 100644
--- a/example/archetype/todoapp/pom.xml
+++ b/example/archetype/todoapp/pom.xml
@@ -44,7 +44,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/e8bd023e/example/archetype/todoapp/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/pom.xml b/example/archetype/todoapp/src/main/resources/archetype-resources/pom.xml
index d15570e..97fd96f 100644
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/pom.xml
+++ b/example/archetype/todoapp/src/main/resources/archetype-resources/pom.xml
@@ -32,8 +32,8 @@
</prerequisites>
<properties>
- <isis.version>1.7.0</isis.version>
- <isis-viewer-wicket.version>1.7.0</isis-viewer-wicket.version>
+ <isis.version>1.8.0-SNAPSHOT</isis.version>
+ <isis-viewer-wicket.version>1.8.0-SNAPSHOT</isis-viewer-wicket.version>
<!-- must be consistent with the versions defined by the JDO Objectstore -->
<datanucleus-accessplatform-jdo-rdbms.version>3.3.6</datanucleus-accessplatform-jdo-rdbms.version>
http://git-wip-us.apache.org/repos/asf/isis/blob/e8bd023e/mothballed/profilestore-inmemory/pom.xml
----------------------------------------------------------------------
diff --git a/mothballed/profilestore-inmemory/pom.xml b/mothballed/profilestore-inmemory/pom.xml
index c152a57..5b8a478 100644
--- a/mothballed/profilestore-inmemory/pom.xml
+++ b/mothballed/profilestore-inmemory/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-profilestore</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/e8bd023e/tool/maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/tool/maven-plugin/pom.xml b/tool/maven-plugin/pom.xml
index 8428378..87549f3 100644
--- a/tool/maven-plugin/pom.xml
+++ b/tool/maven-plugin/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>
[09/24] git commit: ISIS-872: recreating simpleapp archetype
Posted by da...@apache.org.
ISIS-872: recreating simpleapp archetype
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/dc439fd5
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/dc439fd5
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/dc439fd5
Branch: refs/heads/master
Commit: dc439fd5a74f642c290f1103584b8426149eb8be
Parents: 36431cc
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Oct 13 23:12:07 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Oct 13 23:12:07 2014 +0100
----------------------------------------------------------------------
example/archetype/simpleapp/pom.xml | 4 +-
.../META-INF/maven/archetype-metadata.xml | 9 +-
.../resources/archetype-resources/dom/pom.xml | 112 ++++++++-----------
.../src/main/java/dom/simple/SimpleObject.java | 6 +-
.../java/dom/simple/SimpleObject.layout.json | 50 ++++-----
.../src/main/java/dom/simple/SimpleObject.png | Bin 0 -> 557 bytes
.../src/main/java/dom/simple/SimpleObjects.java | 24 +---
.../src/main/resources/images/SimpleObject.png | Bin 557 -> 0 bytes
.../java/dom/simple/SimpleObjectTest_name.java | 9 +-
.../dom/simple/SimpleObjectsTest_create.java | 10 +-
.../archetype-resources/fixture/pom.xml | 20 ++--
.../fixture/simple/SimpleObjectsFixture.java | 2 +-
.../archetype-resources/integtests/pom.xml | 30 ++---
.../integration/SimpleAppSystemInitializer.java | 5 +
.../SimpleObjectsTest_listAll_and_create.java | 5 +-
.../main/resources/archetype-resources/pom.xml | 10 +-
.../ide/intellij/launch/SimpleApp_PROTOTYPE.xml | 1 -
.../launch/SimpleApp__enhance_only_.xml | 1 -
.../archetype-resources/webapp/pom.xml | 70 ------------
.../ComponentFactoryRegistrarForSimpleApp.java | 36 ------
.../src/main/java/webapp/SimpleApplication.java | 26 ++---
.../webapp/prototyping/DeveloperUtilities.java | 53 ---------
.../WEB-INF/authentication_file.passwords | 28 -----
.../WEB-INF/authentication_file.properties | 28 -----
.../webapp/WEB-INF/authorization_file.allow | 28 -----
.../WEB-INF/authorization_file.properties | 50 ---------
.../src/main/webapp/WEB-INF/isis.properties | 47 +-------
.../main/webapp/WEB-INF/persistor.properties | 18 ++-
.../WEB-INF/persistor_datanucleus.properties | 9 +-
.../webapp/WEB-INF/viewer_wicket.properties | 8 ++
.../webapp/src/main/webapp/WEB-INF/web.xml | 2 +-
.../webapp/src/main/webapp/css/application.css | 1 -
.../projects/basic/archetype.properties | 2 +-
33 files changed, 182 insertions(+), 522 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/dc439fd5/example/archetype/simpleapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/pom.xml b/example/archetype/simpleapp/pom.xml
index 4eeade6..7109292 100644
--- a/example/archetype/simpleapp/pom.xml
+++ b/example/archetype/simpleapp/pom.xml
@@ -17,7 +17,7 @@
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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.isis.archetype</groupId>
<artifactId>simpleapp-archetype</artifactId>
@@ -44,7 +44,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.6.0</version>
+ <version>1.7.0</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/dc439fd5/example/archetype/simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml b/example/archetype/simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml
index 5f880e1..e821417 100644
--- a/example/archetype/simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/example/archetype/simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -31,6 +31,7 @@
<fileSet encoding="UTF-8">
<directory>src/main/java</directory>
<includes>
+ <include>**/*.png</include>
<include>**/*.json</include>
</includes>
</fileSet>
@@ -40,12 +41,6 @@
<include>**/*.xml</include>
</includes>
</fileSet>
- <fileSet encoding="UTF-8">
- <directory>src/main/resources</directory>
- <includes>
- <include>**/*.png</include>
- </includes>
- </fileSet>
<fileSet filtered="true" encoding="UTF-8">
<directory>src/test/java</directory>
<includes>
@@ -130,8 +125,6 @@
<fileSet encoding="UTF-8">
<directory>src/main/webapp</directory>
<includes>
- <include>**/*.passwords</include>
- <include>**/*.allow</include>
<include>**/*.png</include>
<include>**/*.js</include>
<include>**/*.ini</include>
http://git-wip-us.apache.org/repos/asf/isis/blob/dc439fd5/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/pom.xml
index 87f8214..5ab3e8b 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/pom.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/pom.xml
@@ -17,18 +17,18 @@
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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>${groupId}</groupId>
- <artifactId>${rootArtifactId}</artifactId>
+ <parent>
+ <groupId>${groupId}</groupId>
+ <artifactId>${rootArtifactId}</artifactId>
<version>${version}</version>
- </parent>
+ </parent>
- <artifactId>${artifactId}</artifactId>
- <name>Simple App DOM</name>
+ <artifactId>${artifactId}</artifactId>
+ <name>Simple App DOM</name>
- <build>
+ <build>
<resources>
<resource>
<directory>src/main/resources</directory>
@@ -43,13 +43,13 @@
</excludes>
</resource>
</resources>
- <plugins>
+ <plugins>
<plugin>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-maven-plugin</artifactId>
<version>${datanucleus-maven-plugin.version}</version>
<configuration>
- <fork>false</fork>
+ <fork>false</fork>
<log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
<verbose>true</verbose>
<props>${basedir}/datanucleus.properties</props>
@@ -63,65 +63,49 @@
</execution>
</executions>
</plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-maven-plugin</artifactId>
- <versionRange>[3.2.0-release,)</versionRange>
- <goals>
- <goal>enhance</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-maven-plugin</artifactId>
+ <versionRange>[3.2.0-release,)</versionRange>
+ <goals>
+ <goal>enhance</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-applib</artifactId>
- </dependency>
-
- <!--
- uncomment to use the AppSettings or UserSettings services
- (also uncomment corresponding dependency in webapp module)
- -->
- <!--
- <dependency>
- <groupId>org.apache.isis.module</groupId>
- <artifactId>isis-module-settings-applib</artifactId>
- </dependency>
+ <dependencies>
<dependency>
- <groupId>org.apache.isis.module</groupId>
- <artifactId>isis-module-devutils-applib</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-applib</artifactId>
</dependency>
- -->
-
- <dependency>
+ <dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
+ <artifactId>isis-core-unittestsupport</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
<!-- Bytecode libraries (for mocking) -->
<dependency>
@@ -129,6 +113,6 @@
<artifactId>objenesis</artifactId>
<scope>test</scope>
</dependency>
+ </dependencies>
- </dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/dc439fd5/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObject.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObject.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObject.java
index d203eb6..5e1fc3e 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObject.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObject.java
@@ -42,8 +42,7 @@ import org.apache.isis.applib.util.ObjectContracts;
public class SimpleObject implements Comparable<SimpleObject> {
//region > name (property)
- // //////////////////////////////////////
-
+
private String name;
@javax.jdo.annotations.Column(allowsNull="false")
@@ -59,9 +58,7 @@ public class SimpleObject implements Comparable<SimpleObject> {
//endregion
-
//region > compareTo
- // //////////////////////////////////////
@Override
public int compareTo(SimpleObject other) {
@@ -71,7 +68,6 @@ public class SimpleObject implements Comparable<SimpleObject> {
//endregion
//region > injected services
- // //////////////////////////////////////
@javax.inject.Inject
@SuppressWarnings("unused")
http://git-wip-us.apache.org/repos/asf/isis/blob/dc439fd5/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObject.layout.json
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObject.layout.json b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObject.layout.json
index aeeb8a2..35f57bb 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObject.layout.json
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObject.layout.json
@@ -15,30 +15,30 @@
* limitations under the License.
*/
{
- columns: [
- {
- span: 6,
- memberGroups: {
- General: {
- members: {
- name: {}
- }
- }
- }
- },
- {
- span: 0,
- memberGroups: {}
- },
- {
- span: 0,
- memberGroups: {}
- },
- {
- span: 6,
- collections: {}
- }
- ],
- actions: {}
+ "columns": [
+ {
+ "span": 6,
+ "memberGroups": {
+ "General": {
+ "members": {
+ "name": {}
+ }
+ }
+ }
+ },
+ {
+ "span": 0,
+ "memberGroups": {}
+ },
+ {
+ "span": 0,
+ "memberGroups": {}
+ },
+ {
+ "span": 6,
+ "collections": {}
+ }
+ ],
+ "actions": {}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/dc439fd5/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObject.png
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObject.png b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObject.png
new file mode 100644
index 0000000..3f91282
Binary files /dev/null and b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObject.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/dc439fd5/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObjects.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObjects.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObjects.java
index c5ec526..b8f69c3 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObjects.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObjects.java
@@ -22,28 +22,19 @@
package dom.simple;
import java.util.List;
+
import org.apache.isis.applib.DomainObjectContainer;
-import org.apache.isis.applib.annotation.*;
+import org.apache.isis.applib.annotation.ActionSemantics;
import org.apache.isis.applib.annotation.ActionSemantics.Of;
+import org.apache.isis.applib.annotation.Bookmarkable;
+import org.apache.isis.applib.annotation.DomainService;
+import org.apache.isis.applib.annotation.MemberOrder;
+import org.apache.isis.applib.annotation.Named;
@DomainService(menuOrder = "10", repositoryFor = SimpleObject.class)
public class SimpleObjects {
- //region > identification in the UI
- // //////////////////////////////////////
-
- public String getId() {
- return "simple";
- }
-
- public String iconName() {
- return "SimpleObject";
- }
-
- //endregion
-
//region > listAll (action)
- // //////////////////////////////////////
@Bookmarkable
@ActionSemantics(Of.SAFE)
@@ -55,8 +46,6 @@ public class SimpleObjects {
//endregion
//region > create (action)
- // //////////////////////////////////////
-
@MemberOrder(sequence = "2")
public SimpleObject create(
final @Named("Name") String name) {
@@ -69,7 +58,6 @@ public class SimpleObjects {
//endregion
//region > injected services
- // //////////////////////////////////////
@javax.inject.Inject
DomainObjectContainer container;
http://git-wip-us.apache.org/repos/asf/isis/blob/dc439fd5/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/resources/images/SimpleObject.png
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/resources/images/SimpleObject.png b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/resources/images/SimpleObject.png
deleted file mode 100644
index 3f91282..0000000
Binary files a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/resources/images/SimpleObject.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/dc439fd5/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/dom/simple/SimpleObjectTest_name.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/dom/simple/SimpleObjectTest_name.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/dom/simple/SimpleObjectTest_name.java
index b905ca5..f9704da 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/dom/simple/SimpleObjectTest_name.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/dom/simple/SimpleObjectTest_name.java
@@ -19,9 +19,9 @@
*/
package dom.simple;
-import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
-import dom.simple.SimpleObject;
import org.junit.Before;
import org.junit.Test;
@@ -38,13 +38,14 @@ public class SimpleObjectTest_name {
@Test
public void happyCase() throws Exception {
// given
+ String name = "Foobar";
assertThat(simpleObject.getName(), is(nullValue()));
// when
- simpleObject.setName("Foobar");
+ simpleObject.setName(name);
// then
- assertThat(simpleObject.getName(), is("Foobar"));
+ assertThat(simpleObject.getName(), is(name));
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/dc439fd5/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/dom/simple/SimpleObjectsTest_create.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/dom/simple/SimpleObjectsTest_create.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/dom/simple/SimpleObjectsTest_create.java
index d260af4..e2bf17f 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/dom/simple/SimpleObjectsTest_create.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/dom/simple/SimpleObjectsTest_create.java
@@ -19,10 +19,12 @@
*/
package dom.simple;
-import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import dom.simple.SimpleObject;
+import org.apache.isis.applib.DomainObjectContainer;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.jmock.Expectations;
import org.jmock.Sequence;
import org.jmock.auto.Mock;
@@ -30,10 +32,6 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.applib.DomainObjectContainer;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-
public class SimpleObjectsTest_create {
@Rule
http://git-wip-us.apache.org/repos/asf/isis/blob/dc439fd5/example/archetype/simpleapp/src/main/resources/archetype-resources/fixture/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/fixture/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/fixture/pom.xml
index eae6a5f..7ff38b4 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/fixture/pom.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/fixture/pom.xml
@@ -17,22 +17,22 @@
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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>${groupId}</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>${rootArtifactId}</artifactId>
<version>${version}</version>
</parent>
- <artifactId>${artifactId}</artifactId>
- <name>Simple App Fixtures</name>
+ <artifactId>${artifactId}</artifactId>
+ <name>Simple App Fixtures</name>
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>${rootArtifactId}-dom</artifactId>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${rootArtifactId}-dom</artifactId>
+ </dependency>
+ </dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/dc439fd5/example/archetype/simpleapp/src/main/resources/archetype-resources/fixture/src/main/java/fixture/simple/SimpleObjectsFixture.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/fixture/src/main/java/fixture/simple/SimpleObjectsFixture.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/fixture/src/main/java/fixture/simple/SimpleObjectsFixture.java
index 139ad01..bb3287e 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/fixture/src/main/java/fixture/simple/SimpleObjectsFixture.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/fixture/src/main/java/fixture/simple/SimpleObjectsFixture.java
@@ -37,7 +37,7 @@ public class SimpleObjectsFixture extends FixtureScript {
protected void execute(ExecutionContext executionContext) {
// prereqs
- execute(new SimpleObjectsTearDownFixture(), executionContext);
+ executeChild(new SimpleObjectsTearDownFixture(), executionContext);
// create
create("Foo", executionContext);
http://git-wip-us.apache.org/repos/asf/isis/blob/dc439fd5/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/pom.xml
index 568cc80..0defa29 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/pom.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/pom.xml
@@ -17,16 +17,16 @@
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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>${groupId}</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>${rootArtifactId}</artifactId>
<version>${version}</version>
</parent>
- <artifactId>${artifactId}</artifactId>
- <name>Simple App Integration Tests</name>
+ <artifactId>${artifactId}</artifactId>
+ <name>Simple App Integration Tests</name>
<build>
<testResources>
@@ -42,15 +42,15 @@
<exclude>**/*.java</exclude>
</excludes>
</testResource>
- </testResources>
+ </testResources>
</build>
- <dependencies>
-
- <!-- other modules in this project -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>${rootArtifactId}-fixture</artifactId>
- </dependency>
+ <dependencies>
+
+ <!-- other modules in this project -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${rootArtifactId}-fixture</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
@@ -65,7 +65,7 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-specsupport</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
@@ -105,7 +105,7 @@
<version>0.0.4</version>
</dependency>
-->
- </dependencies>
+ </dependencies>
<!--
uncomment for enhanced cucumber-jvm reporting
@@ -117,6 +117,6 @@
</repository>
</repositories>
-->
-
+
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/dc439fd5/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/SimpleAppSystemInitializer.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/SimpleAppSystemInitializer.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/SimpleAppSystemInitializer.java
index 7e5384e..b72ddb1 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/SimpleAppSystemInitializer.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/SimpleAppSystemInitializer.java
@@ -21,6 +21,7 @@ package integration;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.integtestsupport.IsisSystemForTest;
+import org.apache.isis.core.runtime.persistence.PersistenceConstants;
import org.apache.isis.objectstore.jdo.datanucleus.DataNucleusPersistenceMechanismInstaller;
import org.apache.isis.objectstore.jdo.datanucleus.IsisConfigurationForJdoIntegTests;
@@ -62,6 +63,10 @@ public class SimpleAppSystemInitializer {
private static IsisConfiguration testConfiguration() {
final IsisConfigurationForJdoIntegTests testConfiguration = new IsisConfigurationForJdoIntegTests();
+
+ // enable stricter checking
+ testConfiguration.put(PersistenceConstants.ENFORCE_SAFE_SEMANTICS, "true");
+
testConfiguration.addRegisterEntitiesPackagePrefix("dom");
return testConfiguration;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/dc439fd5/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/tests/smoke/SimpleObjectsTest_listAll_and_create.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/tests/smoke/SimpleObjectsTest_listAll_and_create.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/tests/smoke/SimpleObjectsTest_listAll_and_create.java
index 2c9e227..fbe949d 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/tests/smoke/SimpleObjectsTest_listAll_and_create.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/tests/smoke/SimpleObjectsTest_listAll_and_create.java
@@ -57,8 +57,11 @@ public class SimpleObjectsTest_listAll_and_create extends SimpleAppIntegTest {
@Test
public void create() throws Exception {
+ // when
wrap(simpleObjects).create("Faz");
-
+ nextTransaction();
+
+ // then
final List<SimpleObject> all = wrap(simpleObjects).listAll();
assertThat(all.size(), is(4));
}
http://git-wip-us.apache.org/repos/asf/isis/blob/dc439fd5/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
index 97d3406..8b8f1f8 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
@@ -32,8 +32,8 @@
</prerequisites>
<properties>
- <isis.version>1.6.0</isis.version>
- <isis-viewer-wicket.version>1.6.0</isis-viewer-wicket.version>
+ <isis.version>1.7.0</isis.version>
+ <isis-viewer-wicket.version>1.7.0</isis-viewer-wicket.version>
<!-- must be consistent with the versions defined by the JDO Objectstore -->
<datanucleus-accessplatform-jdo-rdbms.version>3.3.6</datanucleus-accessplatform-jdo-rdbms.version>
@@ -86,6 +86,7 @@
<configuration>
<includes>
<include>**/*Test.java</include>
+ <include>**/*Test$*.java</include>
<include>**/*Test_*.java</include>
<include>**/*Spec*.java</include>
</includes>
@@ -107,6 +108,7 @@
<configuration>
<includes>
<include>**/*Test.java</include>
+ <include>**/*Test$*.java</include>
<include>**/*Test_*.java</include>
<include>**/*Spec*.java</include>
</includes>
@@ -201,6 +203,8 @@
<exclude>**/.classpath</exclude>
<exclude>**/.settings/**</exclude>
<exclude>**/*.launch</exclude>
+ <exclude>**/ide/eclipse/launch/**</exclude>
+ <exclude>**/ide/intellij/launch/**</exclude>
<exclude>src/site/resources/ide/eclipse/**</exclude>
<exclude>**/rebel.xml</exclude>
@@ -329,6 +333,8 @@
<artifactId>${rootArtifactId}-webapp</artifactId>
<version>${version}</version>
</dependency>
+
+
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/isis/blob/dc439fd5/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/ide/intellij/launch/SimpleApp_PROTOTYPE.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/ide/intellij/launch/SimpleApp_PROTOTYPE.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/ide/intellij/launch/SimpleApp_PROTOTYPE.xml
index 75369db..4c51114 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/ide/intellij/launch/SimpleApp_PROTOTYPE.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/ide/intellij/launch/SimpleApp_PROTOTYPE.xml
@@ -25,7 +25,6 @@
<ConfigurationWrapper RunnerId="Run" />
<method>
<option name="Make" enabled="false" />
- <option name="Maven.BeforeRunTask" enabled="true" file="C:/Apache/Isis/core/pom.xml" goal="-f pom-jdo-enhance-all.xml datanucleus:enhance -o" />
<option name="Maven.BeforeRunTask" enabled="true" file="C:/Apache/Isis/example/application/${parentArtifactId}/dom/pom.xml" goal="datanucleus:enhance -o" />
</method>
</configuration>
http://git-wip-us.apache.org/repos/asf/isis/blob/dc439fd5/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/ide/intellij/launch/SimpleApp__enhance_only_.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/ide/intellij/launch/SimpleApp__enhance_only_.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/ide/intellij/launch/SimpleApp__enhance_only_.xml
index e38ac40..cc13dea 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/ide/intellij/launch/SimpleApp__enhance_only_.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/ide/intellij/launch/SimpleApp__enhance_only_.xml
@@ -19,7 +19,6 @@ s <configuration default="false" name="SimpleApp (enhance only)" type="Applicat
<ConfigurationWrapper RunnerId="Run" />
<method>
<option name="Make" enabled="false" />
- <option name="Maven.BeforeRunTask" enabled="true" file="C:/Apache/Isis/core/pom.xml" goal="-f pom-jdo-enhance-all.xml datanucleus:enhance -o" />
<option name="Maven.BeforeRunTask" enabled="true" file="C:/Apache/Isis/example/application/${parentArtifactId}/dom/pom.xml" goal="datanucleus:enhance -o" />
</method>
</configuration>
http://git-wip-us.apache.org/repos/asf/isis/blob/dc439fd5/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml
index 9ec04b5..efd384a 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml
@@ -184,80 +184,10 @@
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-profilestore</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security</artifactId>
</dependency>
- <!-- isis modules -->
- <dependency>
- <groupId>org.apache.isis.module</groupId>
- <artifactId>isis-module-devutils-impl</artifactId>
- </dependency>
- <!--
- uncomment to enable auditing (@Audited),
- persisted to database
- -->
- <!--
- <dependency>
- <groupId>org.apache.isis.module</groupId>
- <artifactId>isis-module-audit-jdo</artifactId>
- </dependency>
- -->
-
- <!--
- uncomment to enable BackgroundService;
- depends on: an implementation of BackgroundCommandService to persist commands
- (see isis-module-command-jdo)
- -->
- <!--
- <dependency>
- <groupId>org.apache.isis.module</groupId>
- <artifactId>isis-module-background</artifactId>
- </dependency>
- -->
- <!--
- uncomment to enable commands (@Command annotation)
- persisted to database, also enabling the ability to run commands in the background
- (eg using the Quartz scheduler)
- -->
- <!--
- <dependency>
- <groupId>org.apache.isis.module</groupId>
- <artifactId>isis-module-command-jdo</artifactId>
- </dependency>
- -->
-
- <!--
- uncomment to enable publishing (@PublishedObject, @PublishedAction annotations)
- persisted to database, and using the Restful Objects (JSON) serialization of the event.
- -->
- <!--
- <dependency>
- <groupId>org.apache.isis.module</groupId>
- <artifactId>isis-module-publishing-jdo</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.module</groupId>
- <artifactId>isis-module-publishingeventserializer-ro</artifactId>
- </dependency>
- -->
-
- <!--
- uncomment to use the AppSettings or UserSettings services
- (see also declaration of its applib in dom module)
- -->
- <!--
- <dependency>
- <groupId>org.apache.isis.module</groupId>
- <artifactId>isis-module-settings-impl-jdo</artifactId>
- </dependency>
- -->
-
-
<!-- to run using WebServer (optional) -->
<dependency>
<groupId>org.apache.isis.core</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/dc439fd5/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/ComponentFactoryRegistrarForSimpleApp.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/ComponentFactoryRegistrarForSimpleApp.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/ComponentFactoryRegistrarForSimpleApp.java
deleted file mode 100644
index 9c7a0e9..0000000
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/ComponentFactoryRegistrarForSimpleApp.java
+++ /dev/null
@@ -1,36 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * 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 webapp;
-
-import com.google.inject.Singleton;
-
-import org.apache.isis.viewer.wicket.viewer.registries.components.ComponentFactoryRegistrarDefault;
-
-@Singleton
-public class ComponentFactoryRegistrarForSimpleApp extends ComponentFactoryRegistrarDefault {
-
- @Override
- public void addComponentFactories(ComponentFactoryList componentFactories) {
- super.addComponentFactories(componentFactories);
- // currently no replacements
- }
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/dc439fd5/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/SimpleApplication.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/SimpleApplication.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/SimpleApplication.java
index 94cb1e9..2c87197 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/SimpleApplication.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/SimpleApplication.java
@@ -25,9 +25,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.Charset;
import java.util.List;
-
import javax.servlet.http.HttpServletRequest;
-
import com.google.common.base.Joiner;
import com.google.common.io.Resources;
import com.google.inject.AbstractModule;
@@ -35,17 +33,14 @@ import com.google.inject.Module;
import com.google.inject.name.Names;
import com.google.inject.util.Modules;
import com.google.inject.util.Providers;
-
import org.apache.wicket.Session;
+import org.apache.wicket.request.IRequestParameters;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.Response;
import org.apache.wicket.request.http.WebRequest;
-import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistrar;
-import org.apache.isis.viewer.wicket.ui.pages.PageClassList;
import org.apache.isis.viewer.wicket.viewer.IsisWicketApplication;
import org.apache.isis.viewer.wicket.viewer.integration.wicket.AuthenticatedWebSessionForIsis;
-import org.apache.isis.viewer.wicket.viewer.registries.pages.PageClassListDefault;
/**
@@ -87,8 +82,9 @@ public class SimpleApplication extends IsisWicketApplication {
// else demo mode
final AuthenticatedWebSessionForIsis s = (AuthenticatedWebSessionForIsis) super.newSession(request, response);
- final org.apache.wicket.util.string.StringValue user = request.getRequestParameters().getParameterValue("user");
- final org.apache.wicket.util.string.StringValue password = request.getRequestParameters().getParameterValue("pass");
+ IRequestParameters requestParameters = request.getRequestParameters();
+ final org.apache.wicket.util.string.StringValue user = requestParameters.getParameterValue("user");
+ final org.apache.wicket.util.string.StringValue password = requestParameters.getParameterValue("pass");
s.signIn(user.toString(), password.toString());
return s;
}
@@ -115,30 +111,28 @@ public class SimpleApplication extends IsisWicketApplication {
protected Module newIsisWicketModule() {
final Module isisDefaults = super.newIsisWicketModule();
- final Module simpleOverrides = new AbstractModule() {
+ final Module overrides = new AbstractModule() {
@Override
protected void configure() {
- bind(ComponentFactoryRegistrar.class).to(ComponentFactoryRegistrarForSimpleApp.class);
-
bind(String.class).annotatedWith(Names.named("applicationName")).toInstance("Simple App");
bind(String.class).annotatedWith(Names.named("applicationCss")).toInstance("css/application.css");
bind(String.class).annotatedWith(Names.named("applicationJs")).toInstance("scripts/application.js");
- bind(String.class).annotatedWith(Names.named("welcomeMessage")).toInstance(readLines("welcome.html"));
+ bind(String.class).annotatedWith(Names.named("welcomeMessage")).toInstance(readLines(getClass(), "welcome.html"));
bind(String.class).annotatedWith(Names.named("aboutMessage")).toInstance("Simple App");
bind(InputStream.class).annotatedWith(Names.named("metaInfManifest")).toProvider(Providers.of(getServletContext().getResourceAsStream("/META-INF/MANIFEST.MF")));
}
};
- return Modules.override(isisDefaults).with(simpleOverrides);
+ return Modules.override(isisDefaults).with(overrides);
}
- private static String readLines(final String resourceName) {
+ private static String readLines(final Class<?> contextClass, final String resourceName) {
try {
- List<String> readLines = Resources.readLines(Resources.getResource(SimpleApplication.class, resourceName), Charset.defaultCharset());
+ List<String> readLines = Resources.readLines(Resources.getResource(contextClass, resourceName), Charset.defaultCharset());
final String aboutText = Joiner.on("${symbol_escape}n").join(readLines);
return aboutText;
} catch (IOException e) {
- return "This is Quick Start";
+ return "This is a simple app";
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/dc439fd5/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/prototyping/DeveloperUtilities.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/prototyping/DeveloperUtilities.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/prototyping/DeveloperUtilities.java
deleted file mode 100644
index 39d2485..0000000
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/prototyping/DeveloperUtilities.java
+++ /dev/null
@@ -1,53 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/**
- * 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 webapp.prototyping;
-
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.value.Blob;
-import org.apache.isis.applib.value.Clob;
-import org.apache.isis.core.metamodel.services.devutils.DeveloperUtilitiesServiceDefault;
-
-/**
- * These overrides are simply to 'move' the action underneath the
- * {@link fixture.simple.SimpleObjectsFixturesService prototyping} menu.
- */
-@DomainService(menuOrder = "20")
-public class DeveloperUtilities extends DeveloperUtilitiesServiceDefault {
-
- @MemberOrder(name="Prototyping", sequence="90")
- @Override
- public Clob downloadMetaModel() {
- return super.downloadMetaModel();
- }
-
- @MemberOrder(name="Prototyping", sequence="92")
- @Override
- public Blob downloadLayouts() {
- return super.downloadLayouts();
- }
-
- @MemberOrder(name="Prototyping", sequence="94")
- @Override
- public void refreshServices() {
- super.refreshServices();
- }
-}
-
http://git-wip-us.apache.org/repos/asf/isis/blob/dc439fd5/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/authentication_file.passwords
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/authentication_file.passwords b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/authentication_file.passwords
deleted file mode 100644
index 9a568b0..0000000
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/authentication_file.passwords
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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.
-
-
-#
-# configuration file for the file-based authentication
-# not used by the onlinedemo
-#
-
-# list of users, and their password, and optionally roles
-sven:pass:org.apache.isis.viewer.wicket.roles.USER
-dick:pass:org.apache.isis.viewer.wicket.roles.USER
-bob:pass:org.apache.isis.viewer.wicket.roles.USER
-joe:pass:org.apache.isis.viewer.wicket.roles.USER
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/dc439fd5/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/authentication_file.properties
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/authentication_file.properties b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/authentication_file.properties
deleted file mode 100644
index 8edf17c..0000000
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/authentication_file.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-${symbol_pound} Licensed to the Apache Software Foundation (ASF) under one
-${symbol_pound} or more contributor license agreements. See the NOTICE file
-${symbol_pound} distributed with this work for additional information
-${symbol_pound} regarding copyright ownership. The ASF licenses this file
-${symbol_pound} to you under the Apache License, Version 2.0 (the
-${symbol_pound} "License"); you may not use this file except in compliance
-${symbol_pound} with the License. You may obtain a copy of the License at
-${symbol_pound}
-${symbol_pound} http://www.apache.org/licenses/LICENSE-2.0
-${symbol_pound}
-${symbol_pound} Unless required by applicable law or agreed to in writing,
-${symbol_pound} software distributed under the License is distributed on an
-${symbol_pound} "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-${symbol_pound} KIND, either express or implied. See the License for the
-${symbol_pound} specific language governing permissions and limitations
-${symbol_pound} under the License.
-
-${symbol_pound}
-${symbol_pound} configuration file for the File-based authentication mechanism
-${symbol_pound}
-
-
-${symbol_pound}
-${symbol_pound} (intentionally empty)
-${symbol_pound}
http://git-wip-us.apache.org/repos/asf/isis/blob/dc439fd5/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/authorization_file.allow
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/authorization_file.allow b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/authorization_file.allow
deleted file mode 100644
index 4407ec2..0000000
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/authorization_file.allow
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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.
-
-
-#
-# configuration file for the file-based authorization
-#
-
-
-#
-# (intentionally empty)
-#
-
-
http://git-wip-us.apache.org/repos/asf/isis/blob/dc439fd5/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/authorization_file.properties
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/authorization_file.properties b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/authorization_file.properties
deleted file mode 100644
index 7baee9c..0000000
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/authorization_file.properties
+++ /dev/null
@@ -1,50 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-${symbol_pound} Licensed to the Apache Software Foundation (ASF) under one
-${symbol_pound} or more contributor license agreements. See the NOTICE file
-${symbol_pound} distributed with this work for additional information
-${symbol_pound} regarding copyright ownership. The ASF licenses this file
-${symbol_pound} to you under the Apache License, Version 2.0 (the
-${symbol_pound} "License"); you may not use this file except in compliance
-${symbol_pound} with the License. You may obtain a copy of the License at
-${symbol_pound}
-${symbol_pound} http://www.apache.org/licenses/LICENSE-2.0
-${symbol_pound}
-${symbol_pound} Unless required by applicable law or agreed to in writing,
-${symbol_pound} software distributed under the License is distributed on an
-${symbol_pound} "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-${symbol_pound} KIND, either express or implied. See the License for the
-${symbol_pound} specific language governing permissions and limitations
-${symbol_pound} under the License.
-
-${symbol_pound}
-${symbol_pound} configuration file for the File-based authorization mechanism
-${symbol_pound}
-
-
-${symbol_pound}
-${symbol_pound} the whitelist file
-${symbol_pound} (value shown below is the default)
-${symbol_pound}
-
-${symbol_pound}isis.authorization.file.whitelist=authorization_file.allow
-
-
-
-${symbol_pound}
-${symbol_pound} the blacklist file
-${symbol_pound} (there is no default value; provide a filename)
-${symbol_pound}
-
-${symbol_pound}isis.authorization.file.blacklist=
-
-
-
-${symbol_pound}
-${symbol_pound} switch on "learning mode". In this mode the authorization mechanism
-${symbol_pound} will grant all requests, and log those requests into the allow file.
-${symbol_pound}
-
-${symbol_pound}isis.authorization.learn=true
-
http://git-wip-us.apache.org/repos/asf/isis/blob/dc439fd5/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties
index d98d7ee..1e994ca 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties
@@ -53,41 +53,22 @@ isis.persistor=datanucleus
-
${symbol_pound}
${symbol_pound} configure authentication mechanism to use (to logon to the system)
-${symbol_pound} note:
-${symbol_pound} - authentication is disabled if running in exploration mode
-${symbol_pound} - the Scimpi viewer allows access to anonymous users
-${symbol_pound}
+${symbol_pound}
-${symbol_pound} default is file in SERVER mode, none in SERVER_EXPLORATION. Derived from wicket mode
${symbol_pound}isis.authentication=bypass
isis.authentication=shiro
+
${symbol_pound}
${symbol_pound} configure authorization mechanism to use
${symbol_pound}
-${symbol_pound} The authorization mechanism define each users' permissions to view/edit object properties
-${symbol_pound} or collections, and to view/invoke object actions
-${symbol_pound}
-${symbol_pound} configuring this component automatically refines the metamodel (installing a facet factory
-${symbol_pound} which vetoes access as required)
-${symbol_pound}
-${symbol_pound} default is file in SERVER mode, none in SERVER_EXPLORATION. Derived from wicket mode
-${symbol_pound}isis.authorization=file
+${symbol_pound}isis.authorization=bypass
isis.authorization=shiro
-${symbol_pound}
-${symbol_pound} configure the user profile store to use.
-${symbol_pound}
-${symbol_pound} the user profile store is supported by some viewers (though not the Wicket or
-${symbol_pound} Restful viewers) as a way to store user-specific settings (eg colours, themes etc)
-${symbol_pound}
-isis.user-profile-store=in-memory
-
@@ -162,30 +143,11 @@ isis.services.ServicesInstallerFromAnnotation.packagePrefix=dom.simple,${symbol_
fixture.simple,${symbol_escape}
webapp.prototyping
-${symbol_pound}isis.services.prefix =
isis.services = ${symbol_escape}
org.apache.isis.applib.services.bookmark.BookmarkHolderActionContributions,${symbol_escape}
${symbol_escape}
${symbol_pound} customizable exception handling, ${symbol_escape}
org.apache.isis.objectstore.jdo.applib.service.exceprecog.ExceptionRecognizerCompositeForJdoObjectStore,${symbol_escape}
- ${symbol_escape}
- ${symbol_pound} isis-module-command-jdo services, ${symbol_escape}
- ${symbol_pound} org.apache.isis.objectstore.jdo.applib.service.command.CommandServiceJdoContributions,${symbol_escape}
- ${symbol_pound} org.apache.isis.objectstore.jdo.applib.service.background.BackgroundCommandServiceJdoContributions,${symbol_escape}
- ${symbol_escape}
- ${symbol_pound} isis-module-audit-jdo services, ${symbol_escape}
- ${symbol_pound} org.apache.isis.objectstore.jdo.applib.service.audit.AuditingServiceJdoContributions,${symbol_escape}
- ${symbol_escape}
- ${symbol_pound} isis-module-publishing-jdo services, ${symbol_escape}
- ${symbol_pound} org.apache.isis.objectstore.jdo.applib.service.publish.PublishingServiceJdoContributions,${symbol_escape}
- ${symbol_escape}
- ${symbol_pound} JDO implementation of the two SettingsServices, ${symbol_escape}
- ${symbol_pound} org.apache.isis.objectstore.jdo.applib.service.settings.ApplicationSettingsServiceJdo,${symbol_escape}
- ${symbol_pound} org.apache.isis.objectstore.jdo.applib.service.settings.UserSettingsServiceJdo,${symbol_escape}
- ${symbol_escape}
- ${symbol_pound} Core (example) implementations of auditing and publishing services, ${symbol_escape}
- ${symbol_pound} org.apache.isis.applib.services.audit.AuditingService3${symbol_dollar}Stderr,${symbol_escape}
- ${symbol_pound} org.apache.isis.applib.services.publish.PublishingService${symbol_dollar}Stderr,${symbol_escape}
${symbol_pound}
@@ -195,8 +157,7 @@ ${symbol_pound} Fixtures are used to seed the object store with an initial set o
${symbol_pound} in-memory object store, the fixtures are installed on every run. For other
${symbol_pound} object stores, they are used only when the object store is first initialized.
${symbol_pound}
-${symbol_pound}isis.fixtures.prefix=
-isis.fixtures=fixture.simple.SimpleObjectsFixture
+isis.fixtures=fixture.simple.SimpleObjectsFixture
${symbol_pound}
http://git-wip-us.apache.org/repos/asf/isis/blob/dc439fd5/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/persistor.properties
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/persistor.properties b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/persistor.properties
index aaee709..a3a6a51 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/persistor.properties
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/persistor.properties
@@ -20,10 +20,26 @@ ${symbol_pound} under the License.
-${symbol_pound} for emergency use only
+${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
+${symbol_pound}
+${symbol_pound} Persistor
+${symbol_pound}
+${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
+
+
+
+${symbol_pound} generally speaking this should not be enabled
isis.persistor.disableConcurrencyChecking=false
+
+
+${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
+${symbol_pound}
+${symbol_pound} JDBC configuration
+${symbol_pound}
+${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
+
${symbol_pound}
${symbol_pound} configuration file holding the JDO objectstore's JDBC configuration
${symbol_pound} (this is a bit of a hack... just exploiting fact that Isis also loads this file)
http://git-wip-us.apache.org/repos/asf/isis/blob/dc439fd5/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties
index 3bbb84d..4a10f92 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties
@@ -47,6 +47,7 @@ isis.persistor.datanucleus.impl.datanucleus.validateConstraints=true
${symbol_pound}
${symbol_pound} Require explicit persistence (since entities are Comparable and using ObjectContracts${symbol_pound}compareTo).
+${symbol_pound} see http://www.datanucleus.org/products/accessplatform_3_0/jdo/transaction_types.html
${symbol_pound}
isis.persistor.datanucleus.impl.datanucleus.persistenceByReachabilityAtCommit=false
@@ -58,12 +59,14 @@ ${symbol_pound}
isis.persistor.datanucleus.impl.datanucleus.identifier.case=PreserveCase
-${symbol_pound} L2 cache (on by default)
+${symbol_pound}
+${symbol_pound} L2 cache
+${symbol_pound} off except if explicitly marked as cacheable
+${symbol_pound} http://www.datanucleus.org/products/datanucleus/jdo/cache.html
+${symbol_pound}
isis.persistor.datanucleus.impl.datanucleus.cache.level2.type=none
isis.persistor.datanucleus.impl.datanucleus.cache.level2.mode=ENABLE_SELECTIVE
-${symbol_pound}see http://www.datanucleus.org/products/datanucleus/jdo/transaction_types.html${symbol_pound}optimistic
-isis.persistor.datanucleus.impl.datanucleus.persistenceByReachabilityAtCommit=false
${symbol_pound}
http://git-wip-us.apache.org/repos/asf/isis/blob/dc439fd5/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
index b1adf10..17accd5 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
@@ -45,6 +45,14 @@ ${symbol_pound}isis.viewer.wicket.datePickerPattern=dd/mm/y
${symbol_pound}isis.viewer.wicket.suppressRememberMe=true
+
+${symbol_pound}
+${symbol_pound} if user attempts to access a protected URL before signing in, then as a convenience the viewer will continue
+${symbol_pound} through to that destination after successful login. If you consider this to be a security risk then this flag
+${symbol_pound} disables that behaviour.
+${symbol_pound}
+${symbol_pound}isis.viewer.wicket.clearOriginalDestination=true
+
${symbol_pound}isis.viewer.wicket.disableModalDialogs=true
http://git-wip-us.apache.org/repos/asf/isis/blob/dc439fd5/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/web.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/web.xml
index 0f4ee8d..5418b2c 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/web.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/web.xml
@@ -24,7 +24,7 @@
xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>Quickstart Wicket/RestfulObjects app</display-name>
+ <display-name>Simple app</display-name>
<welcome-file-list>
<welcome-file>about/index.html</welcome-file>
http://git-wip-us.apache.org/repos/asf/isis/blob/dc439fd5/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/css/application.css
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/css/application.css b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/css/application.css
index 74d58c4..8aac50a 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/css/application.css
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/css/application.css
@@ -69,4 +69,3 @@ li.x-highlight a {
div.x-key span.scalarName {
color: red;
}
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/dc439fd5/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties b/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
index e213c98..b668f24 100644
--- a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
+++ b/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
@@ -1,4 +1,4 @@
-#Fri Jul 25 08:15:06 BST 2014
+#Mon Oct 13 23:12:00 BST 2014
package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it
[07/24] git commit: [maven-release-plugin] prepare for next
development iteration
Posted by da...@apache.org.
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/c019cd64
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/c019cd64
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/c019cd64
Branch: refs/heads/master
Commit: c019cd6474aa0c53f7afc71db44e15e74c2b9ae1
Parents: e8ce620
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Oct 13 22:08:15 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Oct 13 22:08:15 2014 +0100
----------------------------------------------------------------------
component/viewer/wicket/applib/pom.xml | 2 +-
component/viewer/wicket/impl/pom.xml | 2 +-
component/viewer/wicket/model/pom.xml | 2 +-
component/viewer/wicket/pom.xml | 20 ++++++++------------
component/viewer/wicket/tck/pom.xml | 8 ++------
component/viewer/wicket/ui/pom.xml | 2 +-
6 files changed, 14 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/c019cd64/component/viewer/wicket/applib/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/applib/pom.xml b/component/viewer/wicket/applib/pom.xml
index 30bf4e7..a68ae9e 100644
--- a/component/viewer/wicket/applib/pom.xml
+++ b/component/viewer/wicket/applib/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-viewer-wicket-applib</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/c019cd64/component/viewer/wicket/impl/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/pom.xml b/component/viewer/wicket/impl/pom.xml
index e4ff1c8..12828c8 100644
--- a/component/viewer/wicket/impl/pom.xml
+++ b/component/viewer/wicket/impl/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<name>Isis Wicket Viewer Implementation</name>
http://git-wip-us.apache.org/repos/asf/isis/blob/c019cd64/component/viewer/wicket/model/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/model/pom.xml b/component/viewer/wicket/model/pom.xml
index fa6a4af..d631017 100644
--- a/component/viewer/wicket/model/pom.xml
+++ b/component/viewer/wicket/model/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-viewer-wicket-model</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/c019cd64/component/viewer/wicket/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/pom.xml b/component/viewer/wicket/pom.xml
index 5d70350..354926f 100644
--- a/component/viewer/wicket/pom.xml
+++ b/component/viewer/wicket/pom.xml
@@ -30,7 +30,7 @@
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
<name>Isis Wicket Viewer</name>
@@ -101,41 +101,41 @@
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-applib</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-model</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-model</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-ui</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-ui</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-impl</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-impl</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
@@ -321,8 +321,4 @@
</dependencies>
</dependencyManagement>
-
- <scm>
- <tag>isis-viewer-wicket-1.7.0-RC1</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/c019cd64/component/viewer/wicket/tck/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/tck/pom.xml b/component/viewer/wicket/tck/pom.xml
index ceca4f7..b4e846a 100644
--- a/component/viewer/wicket/tck/pom.xml
+++ b/component/viewer/wicket/tck/pom.xml
@@ -29,13 +29,13 @@
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-tck</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
<name>Isis Wicket Viewer TCK tests</name>
<properties>
- <isis-viewer-wicket.version>1.7.0</isis-viewer-wicket.version>
+ <isis-viewer-wicket.version>1.8.0-SNAPSHOT</isis-viewer-wicket.version>
<siteBaseDir>..</siteBaseDir>
<relativeUrl>wicket-tck/</relativeUrl>
<!-- until someone comes up with a better solution -->
@@ -110,8 +110,4 @@
</dependency>
</dependencies>
-
- <scm>
- <tag>isis-viewer-wicket-1.7.0-RC1</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/c019cd64/component/viewer/wicket/ui/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/pom.xml b/component/viewer/wicket/ui/pom.xml
index 57c1c83..ec80b76 100644
--- a/component/viewer/wicket/ui/pom.xml
+++ b/component/viewer/wicket/ui/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-viewer-wicket-ui</artifactId>
[11/24] git commit: [maven-release-plugin] prepare for next
development iteration
Posted by da...@apache.org.
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/8ad38efc
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/8ad38efc
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/8ad38efc
Branch: refs/heads/master
Commit: 8ad38efc812ef814bfe2cee01a9444a2b0379536
Parents: 7156ba2
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Oct 13 23:22:28 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Oct 13 23:22:28 2014 +0100
----------------------------------------------------------------------
example/archetype/simpleapp/pom.xml | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/8ad38efc/example/archetype/simpleapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/pom.xml b/example/archetype/simpleapp/pom.xml
index 1acc700..d2c824a 100644
--- a/example/archetype/simpleapp/pom.xml
+++ b/example/archetype/simpleapp/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.isis.archetype</groupId>
<artifactId>simpleapp-archetype</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
<name>simpleapp-archetype</name>
<build>
@@ -47,8 +47,4 @@
<version>1.7.0</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
-
- <scm>
- <tag>simpleapp-archetype-1.7.0-RC1</tag>
- </scm>
</project>
[04/24] git commit: [maven-release-plugin] prepare for next
development iteration
Posted by da...@apache.org.
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/9c4f5c21
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/9c4f5c21
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/9c4f5c21
Branch: refs/heads/master
Commit: 9c4f5c213af0c372413cbe085f87a9eb3927b448
Parents: d7f0647
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Oct 13 20:13:48 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Oct 13 20:13:48 2014 +0100
----------------------------------------------------------------------
core/applib/pom.xml | 2 +-
core/bytecode-cglib/pom.xml | 2 +-
core/bytecode-javassist/pom.xml | 4 +-
core/integtestsupport/pom.xml | 2 +-
core/log4j/pom.xml | 2 +-
core/metamodel/pom.xml | 2 +-
core/objectstore-inmemory/pom.xml | 2 +-
core/objectstore-jdo-datanucleus/pom.xml | 2 +-
core/objectstore-jdo-metamodel/pom.xml | 2 +-
core/pom.xml | 70 +++++++++++------------
core/runtime/pom.xml | 2 +-
core/security-noop/pom.xml | 2 +-
core/security-shiro/pom.xml | 6 +-
core/specsupport/pom.xml | 2 +-
core/tck/pom.xml | 2 +-
core/tck/tck-dom/pom.xml | 2 +-
core/tck/tck-fixture/pom.xml | 2 +-
core/tck/tck-viewer-restfulobjects/pom.xml | 2 +-
core/unittestsupport/pom.xml | 2 +-
core/viewer-restfulobjects-applib/pom.xml | 2 +-
core/viewer-restfulobjects-rendering/pom.xml | 2 +-
core/viewer-restfulobjects-server/pom.xml | 2 +-
core/webserver/pom.xml | 2 +-
core/wrapper/pom.xml | 2 +-
24 files changed, 61 insertions(+), 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/9c4f5c21/core/applib/pom.xml
----------------------------------------------------------------------
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index d1ef3be..f3f85d2 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-applib</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9c4f5c21/core/bytecode-cglib/pom.xml
----------------------------------------------------------------------
diff --git a/core/bytecode-cglib/pom.xml b/core/bytecode-cglib/pom.xml
index 4f8decf..c3b7dee 100644
--- a/core/bytecode-cglib/pom.xml
+++ b/core/bytecode-cglib/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-bytecode-cglib</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9c4f5c21/core/bytecode-javassist/pom.xml
----------------------------------------------------------------------
diff --git a/core/bytecode-javassist/pom.xml b/core/bytecode-javassist/pom.xml
index f03dc72..bde09da 100644
--- a/core/bytecode-javassist/pom.xml
+++ b/core/bytecode-javassist/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-bytecode-javassist</artifactId>
@@ -39,7 +39,7 @@
<connection>scm:svn:http://svn.apache.org/repos/asf/incubator/isis/trunk/runtimes/dflt/bytecode/javassist/</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/isis/trunk$/{relativeUrl}</developerConnection>
<url>http://svn.apache.org/repos/asf/incubator/isis/trunk/runtimes/dflt/bytecode/javassist/</url>
- <tag>isis-1.7.0-RC1</tag>
+ <tag>HEAD</tag>
</scm>
<!-- used in Site generation for relative references. -->
http://git-wip-us.apache.org/repos/asf/isis/blob/9c4f5c21/core/integtestsupport/pom.xml
----------------------------------------------------------------------
diff --git a/core/integtestsupport/pom.xml b/core/integtestsupport/pom.xml
index 8ac9730..63dc02a 100644
--- a/core/integtestsupport/pom.xml
+++ b/core/integtestsupport/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-integtestsupport</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9c4f5c21/core/log4j/pom.xml
----------------------------------------------------------------------
diff --git a/core/log4j/pom.xml b/core/log4j/pom.xml
index ee0bbab..c6d171b 100644
--- a/core/log4j/pom.xml
+++ b/core/log4j/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-log4j</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9c4f5c21/core/metamodel/pom.xml
----------------------------------------------------------------------
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index ff0a8c1..40c23ed 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-metamodel</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9c4f5c21/core/objectstore-inmemory/pom.xml
----------------------------------------------------------------------
diff --git a/core/objectstore-inmemory/pom.xml b/core/objectstore-inmemory/pom.xml
index 319c66c..6a59929 100644
--- a/core/objectstore-inmemory/pom.xml
+++ b/core/objectstore-inmemory/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-objectstore</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9c4f5c21/core/objectstore-jdo-datanucleus/pom.xml
----------------------------------------------------------------------
diff --git a/core/objectstore-jdo-datanucleus/pom.xml b/core/objectstore-jdo-datanucleus/pom.xml
index eff072c..bc39760 100644
--- a/core/objectstore-jdo-datanucleus/pom.xml
+++ b/core/objectstore-jdo-datanucleus/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-objectstore-jdo-datanucleus</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9c4f5c21/core/objectstore-jdo-metamodel/pom.xml
----------------------------------------------------------------------
diff --git a/core/objectstore-jdo-metamodel/pom.xml b/core/objectstore-jdo-metamodel/pom.xml
index 61cc301..f3471e8 100644
--- a/core/objectstore-jdo-metamodel/pom.xml
+++ b/core/objectstore-jdo-metamodel/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-objectstore-jdo-metamodel</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9c4f5c21/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index e41af67..05cd0ea 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -153,7 +153,7 @@
<connection>scm:git:http://git.apache.org/isis.git/core</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/isis.git/trunk/framework/</developerConnection>
<url>git://git.apache.org/isis.git/core</url>
- <tag>isis-1.7.0-RC1</tag>
+ <tag>HEAD</tag>
</scm>
<!-- used in Site generation for relative references. -->
@@ -1031,13 +1031,13 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
<!-- not scope=test, because referenced by some sql-tests-common under compile scope -->
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1046,14 +1046,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1062,7 +1062,7 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-log4j</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -1071,14 +1071,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1087,52 +1087,52 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-wrapper</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</dependency>
<!-- bytecode components -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-bytecode-cglib</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-bytecode-javassist</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</dependency>
<!-- webserver -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-webserver</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</dependency>
<!-- specsupport -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-specsupport</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</dependency>
<!-- integtestsupport -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-integtestsupport</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
<!-- not scope=test, because referenced by some sql-tests-common under compile scope -->
</dependency>
@@ -1140,36 +1140,36 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-objectstore</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-objectstore</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-objectstore-jdo-metamodel</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-objectstore-jdo-metamodel</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-objectstore-jdo-datanucleus</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-objectstore-jdo-datanucleus</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
@@ -1179,36 +1179,36 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1218,12 +1218,12 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</dependency>
@@ -1231,22 +1231,22 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck-dom</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck-fixture</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck-viewer-restfulobjects</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/9c4f5c21/core/runtime/pom.xml
----------------------------------------------------------------------
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index b3f3566..cf8ff65 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-runtime</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9c4f5c21/core/security-noop/pom.xml
----------------------------------------------------------------------
diff --git a/core/security-noop/pom.xml b/core/security-noop/pom.xml
index 27330d6..0db0b35 100644
--- a/core/security-noop/pom.xml
+++ b/core/security-noop/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-security</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9c4f5c21/core/security-shiro/pom.xml
----------------------------------------------------------------------
diff --git a/core/security-shiro/pom.xml b/core/security-shiro/pom.xml
index 8773f4e..0f7bab5 100644
--- a/core/security-shiro/pom.xml
+++ b/core/security-shiro/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
<name>Isis Core Shiro Security</name>
@@ -102,7 +102,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/isis/blob/9c4f5c21/core/specsupport/pom.xml
----------------------------------------------------------------------
diff --git a/core/specsupport/pom.xml b/core/specsupport/pom.xml
index 734562f..3507691 100644
--- a/core/specsupport/pom.xml
+++ b/core/specsupport/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-specsupport</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9c4f5c21/core/tck/pom.xml
----------------------------------------------------------------------
diff --git a/core/tck/pom.xml b/core/tck/pom.xml
index 7ff657b..52cc6e1 100644
--- a/core/tck/pom.xml
+++ b/core/tck/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-tck</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9c4f5c21/core/tck/tck-dom/pom.xml
----------------------------------------------------------------------
diff --git a/core/tck/tck-dom/pom.xml b/core/tck/tck-dom/pom.xml
index 9404cfd..e4a0333 100644
--- a/core/tck/tck-dom/pom.xml
+++ b/core/tck/tck-dom/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-tck-dom</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9c4f5c21/core/tck/tck-fixture/pom.xml
----------------------------------------------------------------------
diff --git a/core/tck/tck-fixture/pom.xml b/core/tck/tck-fixture/pom.xml
index 197f2bd..01cf5ad 100644
--- a/core/tck/tck-fixture/pom.xml
+++ b/core/tck/tck-fixture/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-tck-fixture</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9c4f5c21/core/tck/tck-viewer-restfulobjects/pom.xml
----------------------------------------------------------------------
diff --git a/core/tck/tck-viewer-restfulobjects/pom.xml b/core/tck/tck-viewer-restfulobjects/pom.xml
index 878995a..489f612 100644
--- a/core/tck/tck-viewer-restfulobjects/pom.xml
+++ b/core/tck/tck-viewer-restfulobjects/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-tck-viewer-restfulobjects</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9c4f5c21/core/unittestsupport/pom.xml
----------------------------------------------------------------------
diff --git a/core/unittestsupport/pom.xml b/core/unittestsupport/pom.xml
index b37f0bd..ba02267 100644
--- a/core/unittestsupport/pom.xml
+++ b/core/unittestsupport/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-unittestsupport</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9c4f5c21/core/viewer-restfulobjects-applib/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/pom.xml b/core/viewer-restfulobjects-applib/pom.xml
index 6aaa7d8..2915072 100644
--- a/core/viewer-restfulobjects-applib/pom.xml
+++ b/core/viewer-restfulobjects-applib/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9c4f5c21/core/viewer-restfulobjects-rendering/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/pom.xml b/core/viewer-restfulobjects-rendering/pom.xml
index e4c8e31..586fe28 100644
--- a/core/viewer-restfulobjects-rendering/pom.xml
+++ b/core/viewer-restfulobjects-rendering/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9c4f5c21/core/viewer-restfulobjects-server/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/pom.xml b/core/viewer-restfulobjects-server/pom.xml
index 8d51e89..0c84024 100644
--- a/core/viewer-restfulobjects-server/pom.xml
+++ b/core/viewer-restfulobjects-server/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9c4f5c21/core/webserver/pom.xml
----------------------------------------------------------------------
diff --git a/core/webserver/pom.xml b/core/webserver/pom.xml
index a080080..5948a98 100644
--- a/core/webserver/pom.xml
+++ b/core/webserver/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-webserver</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9c4f5c21/core/wrapper/pom.xml
----------------------------------------------------------------------
diff --git a/core/wrapper/pom.xml b/core/wrapper/pom.xml
index 0752eff..0ae07e8 100644
--- a/core/wrapper/pom.xml
+++ b/core/wrapper/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-wrapper</artifactId>
[14/24] git commit: ISIS-872: recreating todoapp archetype
Posted by da...@apache.org.
ISIS-872: recreating todoapp archetype
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/ec94051e
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/ec94051e
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/ec94051e
Branch: refs/heads/master
Commit: ec94051e39afdabd2a9e7ea4c2a1cb5b7f5c446d
Parents: 66e02d8
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Oct 13 23:45:32 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Oct 13 23:45:32 2014 +0100
----------------------------------------------------------------------
example/archetype/todoapp/pom.xml | 4 +-
.../META-INF/maven/archetype-metadata.xml | 10 +-
.../resources/archetype-resources/dom/pom.xml | 107 ++++++-----
.../dom/src/main/java/app/ToDoAppDashboard.java | 4 -
.../dom/src/main/java/app/ToDoAppDashboard.png | Bin 0 -> 684 bytes
.../dom/src/main/java/app/ToDoItemAnalysis.java | 10 +-
.../java/app/ToDoItemsByCategoryViewModel.java | 24 ++-
.../java/app/ToDoItemsByDateRangeViewModel.java | 25 +--
.../src/main/java/dom/todo/ToDoItem-done.png | Bin 0 -> 1363 bytes
.../src/main/java/dom/todo/ToDoItem-todo.png | Bin 0 -> 971 bytes
.../dom/src/main/java/dom/todo/ToDoItem.java | 87 +++------
.../dom/src/main/java/dom/todo/ToDoItem.png | Bin 0 -> 971 bytes
.../java/dom/todo/ToDoItemSubscriptions.java | 10 +-
.../dom/src/main/java/dom/todo/ToDoItems.java | 10 --
.../dom/src/main/resources/images/Dashboard.png | Bin 684 -> 0 bytes
.../src/main/resources/images/ToDoItem-done.png | Bin 1363 -> 0 bytes
.../src/main/resources/images/ToDoItem-todo.png | Bin 971 -> 0 bytes
.../dom/src/main/resources/images/ToDoItem.png | Bin 971 -> 0 bytes
.../archetype-resources/fixture/pom.xml | 20 +--
.../fixture/todo/ToDoItemsFixturesService.java | 2 +-
.../integtests/ToDoItemsIntegTestFixture.java | 2 +-
.../fixture/todo/simple/ToDoItemsRecreate.java | 2 +-
.../ToDoItemsRecreateAndCompleteSeveral.java | 2 +-
.../archetype-resources/integtests/pom.xml | 30 ++--
.../java/integration/ToDoSystemInitializer.java | 8 +
.../tests/ToDoItemContributionsIntegTest.java | 12 +-
.../integration/tests/ToDoItemIntegTest.java | 13 +-
.../integration/tests/ToDoItemsIntegTest.java | 36 +++-
.../main/resources/archetype-resources/pom.xml | 32 ++--
.../archetype-resources/webapp/pom.xml | 46 -----
.../ComponentFactoryRegistrarForToDoApp.java | 36 ----
.../main/java/webapp/CustomMementoService.java | 64 +++++++
.../webapp/CustomRepresentationService.java | 35 ++++
.../java/webapp/PageClassListForToDoApp.java | 64 -------
.../src/main/java/webapp/ToDoApplication.java | 22 +--
.../src/main/java/webapp/admin/Admin.java | 176 -------------------
.../java/webapp/admin/AdminContributions.java | 110 ------------
.../webapp/prototyping/DeveloperUtilities.java | 53 ------
.../prototyping/ExternalLinksService.java | 2 +-
.../webapp/scheduler/AbstractIsisQuartzJob.java | 96 ----------
.../BackgroundCommandExecutionQuartzJob.java | 31 ----
.../webapp/scheduler/SchedulerConstants.java | 30 ----
.../webapp/src/main/resources/webapp/realm1.ini | 29 ++-
.../webapp/src/main/resources/webapp/realm2.ini | 66 -------
.../webapp/scheduler/quartz-config.xml | 65 -------
.../webapp/scheduler/quartz.properties | 28 ---
.../WEB-INF/authentication_file.passwords | 28 ---
.../WEB-INF/authentication_file.properties | 28 ---
.../webapp/WEB-INF/authorization_file.allow | 28 ---
.../WEB-INF/authorization_file.properties | 50 ------
.../src/main/webapp/WEB-INF/isis.properties | 49 +-----
.../main/webapp/WEB-INF/persistor.properties | 20 ++-
.../WEB-INF/persistor_datanucleus.properties | 9 +-
.../webapp/src/main/webapp/WEB-INF/shiro.ini | 6 +-
.../webapp/WEB-INF/viewer_wicket.properties | 8 +
.../webapp/src/main/webapp/WEB-INF/web.xml | 21 +--
.../webapp/src/main/webapp/about/index.html | 14 +-
.../projects/basic/archetype.properties | 2 +-
58 files changed, 378 insertions(+), 1288 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/pom.xml b/example/archetype/todoapp/pom.xml
index dd73d4a..cddfb32 100644
--- a/example/archetype/todoapp/pom.xml
+++ b/example/archetype/todoapp/pom.xml
@@ -17,7 +17,7 @@
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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.isis.archetype</groupId>
<artifactId>todoapp-archetype</artifactId>
@@ -44,7 +44,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.6.0</version>
+ <version>1.7.0</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/META-INF/maven/archetype-metadata.xml
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/META-INF/maven/archetype-metadata.xml b/example/archetype/todoapp/src/main/resources/META-INF/maven/archetype-metadata.xml
index a87e7ef..2698586 100644
--- a/example/archetype/todoapp/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/example/archetype/todoapp/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -31,6 +31,7 @@
<fileSet encoding="UTF-8">
<directory>src/main/java</directory>
<includes>
+ <include>**/*.png</include>
<include>**/*.json</include>
</includes>
</fileSet>
@@ -40,12 +41,6 @@
<include>**/*.xml</include>
</includes>
</fileSet>
- <fileSet encoding="UTF-8">
- <directory>src/main/resources</directory>
- <includes>
- <include>**/*.png</include>
- </includes>
- </fileSet>
<fileSet filtered="true" encoding="UTF-8">
<directory>src/test/java</directory>
<includes>
@@ -118,7 +113,6 @@
<directory>src/main/resources</directory>
<includes>
<include>**/*.html</include>
- <include>**/*.xml</include>
<include>**/*.properties</include>
</includes>
</fileSet>
@@ -132,8 +126,6 @@
<fileSet encoding="UTF-8">
<directory>src/main/webapp</directory>
<includes>
- <include>**/*.passwords</include>
- <include>**/*.allow</include>
<include>**/*.png</include>
<include>**/*.js</include>
<include>**/*.ini</include>
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/dom/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/pom.xml b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/pom.xml
index 4b60832..271e198 100644
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/pom.xml
+++ b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/pom.xml
@@ -17,18 +17,18 @@
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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>${groupId}</groupId>
- <artifactId>${rootArtifactId}</artifactId>
+ <parent>
+ <groupId>${groupId}</groupId>
+ <artifactId>${rootArtifactId}</artifactId>
<version>${version}</version>
- </parent>
+ </parent>
- <artifactId>${artifactId}</artifactId>
- <name>ToDo App DOM</name>
+ <artifactId>${artifactId}</artifactId>
+ <name>ToDo App DOM</name>
- <build>
+ <build>
<resources>
<resource>
<directory>src/main/resources</directory>
@@ -43,13 +43,13 @@
</excludes>
</resource>
</resources>
- <plugins>
+ <plugins>
<plugin>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-maven-plugin</artifactId>
<version>${datanucleus-maven-plugin.version}</version>
<configuration>
- <fork>false</fork>
+ <fork>false</fork>
<log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
<verbose>true</verbose>
<props>${basedir}/datanucleus.properties</props>
@@ -63,58 +63,49 @@
</execution>
</executions>
</plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-maven-plugin</artifactId>
- <versionRange>[3.2.0-release,)</versionRange>
- <goals>
- <goal>enhance</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-maven-plugin</artifactId>
+ <versionRange>[3.2.0-release,)</versionRange>
+ <goals>
+ <goal>enhance</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-applib</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.module</groupId>
- <artifactId>isis-module-settings-applib</artifactId>
- </dependency>
+ <dependencies>
<dependency>
- <groupId>org.apache.isis.module</groupId>
- <artifactId>isis-module-devutils-applib</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-applib</artifactId>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
+ <artifactId>isis-core-unittestsupport</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
<!-- Bytecode libraries (for mocking) -->
<dependency>
@@ -122,6 +113,6 @@
<artifactId>objenesis</artifactId>
<scope>test</scope>
</dependency>
- </dependencies>
-
+ </dependencies>
+
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoAppDashboard.java
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoAppDashboard.java b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoAppDashboard.java
index c63b566..641c06d 100644
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoAppDashboard.java
+++ b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoAppDashboard.java
@@ -35,10 +35,6 @@ public class ToDoAppDashboard extends AbstractViewModel {
public String title() {
return "Dashboard";
}
-
- public String iconName() {
- return "Dashboard";
- }
//endregion
//region > ViewModel contract
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoAppDashboard.png
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoAppDashboard.png b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoAppDashboard.png
new file mode 100644
index 0000000..c22ab2b
Binary files /dev/null and b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoAppDashboard.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemAnalysis.java
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemAnalysis.java b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemAnalysis.java
index 9609164..5f7eeef 100644
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemAnalysis.java
+++ b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemAnalysis.java
@@ -61,10 +61,7 @@ public class ToDoItemAnalysis {
return new Function<Category, ToDoItemsByCategoryViewModel>(){
@Override
public ToDoItemsByCategoryViewModel apply(final Category category) {
- final ToDoItemsByCategoryViewModel byCategory =
- container.newViewModelInstance(ToDoItemsByCategoryViewModel.class, category.name());
- byCategory.setCategory(category);
- return byCategory;
+ return new ToDoItemsByCategoryViewModel(category);
}
};
}
@@ -94,10 +91,7 @@ public class ToDoItemAnalysis {
return new Function<DateRange, ToDoItemsByDateRangeViewModel>(){
@Override
public ToDoItemsByDateRangeViewModel apply(final DateRange dateRange) {
- final ToDoItemsByDateRangeViewModel byDateRange =
- container.newViewModelInstance(ToDoItemsByDateRangeViewModel.class, dateRange.name());
- byDateRange.setDateRange(dateRange);
- return byDateRange;
+ return new ToDoItemsByDateRangeViewModel(dateRange);
}
};
}
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemsByCategoryViewModel.java
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemsByCategoryViewModel.java b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemsByCategoryViewModel.java
index f92cbac..6eddbc8 100644
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemsByCategoryViewModel.java
+++ b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemsByCategoryViewModel.java
@@ -32,35 +32,29 @@ import com.google.common.base.Function;
import com.google.common.base.Joiner;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
-import org.apache.isis.applib.AbstractViewModel;
+import org.apache.isis.applib.DomainObjectContainer;
import org.apache.isis.applib.annotation.*;
import org.apache.isis.applib.annotation.Render.Type;
import org.apache.isis.applib.util.ObjectContracts;
@Named("By Category")
@Bookmarkable
+@ViewModel
public class ToDoItemsByCategoryViewModel
- extends AbstractViewModel
implements Comparable<ToDoItemsByCategoryViewModel> {
- //region > viewModel implementation
- @Override
- public String viewModelMemento() {
- return getCategory().name();
+ //region > constructors
+ public ToDoItemsByCategoryViewModel() {
}
-
- @Override
- public void viewModelInit(String memento) {
- setCategory(Category.valueOf(memento));
+ public ToDoItemsByCategoryViewModel(Category category) {
+ setCategory(category);
}
//endregion
+
//region > category (property)
private Category category;
- /**
- * Used as {@link ${symbol_pound}viewModelMemento() memento}
- */
@Title
public Category getCategory() {
return category;
@@ -132,7 +126,7 @@ public class ToDoItemsByCategoryViewModel
@Named("Delete")
public ToDoItemsByCategoryViewModel deleteCompleted() {
for (ToDoItem item : getItemsComplete()) {
- removeIfNotAlready(item);
+ container.removeIfNotAlready(item);
}
// force reload of page
return this;
@@ -149,6 +143,8 @@ public class ToDoItemsByCategoryViewModel
//region > injected services
@javax.inject.Inject
+ private DomainObjectContainer container;
+ @javax.inject.Inject
private ToDoItems toDoItems;
//endregion
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemsByDateRangeViewModel.java
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemsByDateRangeViewModel.java b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemsByDateRangeViewModel.java
index 5d2b118..3523f8a 100644
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemsByDateRangeViewModel.java
+++ b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemsByDateRangeViewModel.java
@@ -36,39 +36,28 @@ import dom.todo.ToDoItems;
import org.joda.time.DateTime;
import org.apache.isis.applib.AbstractViewModel;
-import org.apache.isis.applib.annotation.Bookmarkable;
-import org.apache.isis.applib.annotation.Named;
-import org.apache.isis.applib.annotation.Render;
+import org.apache.isis.applib.annotation.*;
import org.apache.isis.applib.annotation.Render.Type;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.services.clock.ClockService;
import org.apache.isis.applib.util.ObjectContracts;
@Named("By Date Range")
@Bookmarkable
-public class ToDoItemsByDateRangeViewModel
- extends AbstractViewModel
+@ViewModel
+public class ToDoItemsByDateRangeViewModel
implements Comparable<ToDoItemsByDateRangeViewModel> {
- //region > viewModel implementation
- @Override
- public String viewModelMemento() {
- return getDateRange().name();
+ //region > constructors
+ public ToDoItemsByDateRangeViewModel() {
}
-
- @Override
- public void viewModelInit(String memento) {
- setDateRange(DateRange.valueOf(memento));
+ public ToDoItemsByDateRangeViewModel(DateRange dateRange) {
+ setDateRange(dateRange);
}
-
//endregion
//region > dateRange (property)
private DateRange dateRange;
- /**
- * Used as {@link ${symbol_pound}viewModelMemento() memento}
- */
@Title
public DateRange getDateRange() {
return dateRange;
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItem-done.png
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItem-done.png b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItem-done.png
new file mode 100644
index 0000000..b0fc6e8
Binary files /dev/null and b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItem-done.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItem-todo.png
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItem-todo.png b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItem-todo.png
new file mode 100644
index 0000000..99a9fed
Binary files /dev/null and b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItem-todo.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItem.java
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItem.java b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItem.java
index 4ddc10d..c32b3a8 100644
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItem.java
+++ b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItem.java
@@ -40,14 +40,11 @@ import org.apache.isis.applib.annotation.*;
import org.apache.isis.applib.annotation.ActionSemantics.Of;
import org.apache.isis.applib.annotation.Bulk.AppliesTo;
import org.apache.isis.applib.annotation.Bulk.InteractionContext.InvokedAs;
-import org.apache.isis.applib.annotation.Command.ExecuteIn;
-import org.apache.isis.applib.annotation.Optional;
-import org.apache.isis.applib.services.background.BackgroundService;
-import org.apache.isis.applib.services.clock.ClockService;
-import org.apache.isis.applib.services.command.CommandContext;
+import org.apache.isis.applib.security.UserMemento;
import org.apache.isis.applib.services.eventbus.ActionInteractionEvent;
import org.apache.isis.applib.services.eventbus.EventBusService;
import org.apache.isis.applib.services.scratchpad.Scratchpad;
+import org.apache.isis.applib.services.wrapper.HiddenException;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.applib.util.ObjectContracts;
import org.apache.isis.applib.util.TitleBuffer;
@@ -98,8 +95,6 @@ import org.apache.isis.applib.value.Clob;
+ "description.indexOf(:description) >= 0")
})
@ObjectType("TODO")
-@Audited
-@PublishedObject(ToDoItemChangedPayloadFactory.class)
@AutoComplete(repository=ToDoItems.class, action="autoComplete") // default unless overridden by autoCompleteNXxx() method
//@Bounded - if there were a small number of instances only (overrides autoComplete functionality)
@Bookmarkable
@@ -120,15 +115,20 @@ public class ToDoItem implements Categorized, Comparable<ToDoItem> {
if (isComplete()) {
buf.append("- Completed!");
} else {
- if (getDueBy() != null) {
- buf.append(" due by", getDueBy());
+ try {
+ final LocalDate dueBy = wrapperFactory.wrap(this).getDueBy();
+ if (dueBy != null) {
+ buf.append(" due by", dueBy);
+ }
+ } catch(HiddenException ex) {
+ // ignore
}
}
return buf.toString();
}
public String iconName() {
- return "ToDoItem-" + (!isComplete() ? "todo" : "done");
+ return !isComplete() ? "todo" : "done";
}
//endregion
@@ -162,6 +162,11 @@ public class ToDoItem implements Categorized, Comparable<ToDoItem> {
return dueBy;
}
+ public boolean hideDueBy() {
+ final UserMemento user = container.getUser();
+ return user.hasRole("realm1:noDueBy_role");
+ }
+
public void setDueBy(final LocalDate dueBy) {
this.dueBy = dueBy;
}
@@ -288,8 +293,6 @@ public class ToDoItem implements Categorized, Comparable<ToDoItem> {
}
@ActionInteraction(CompletedEvent.class)
- @Command
- @PublishedAction
@Bulk
public ToDoItem completed() {
setComplete(true);
@@ -316,8 +319,6 @@ public class ToDoItem implements Categorized, Comparable<ToDoItem> {
}
@ActionInteraction(NoLongerCompletedEvent.class)
- @Command
- @PublishedAction
@Bulk
public ToDoItem notYetCompleted() {
setComplete(false);
@@ -489,7 +490,6 @@ public class ToDoItem implements Categorized, Comparable<ToDoItem> {
getDependencies().remove(toDoItem);
}
- @PublishedAction
public ToDoItem add(
@TypicalLength(20)
final ToDoItem toDoItem) {
@@ -617,29 +617,11 @@ public class ToDoItem implements Categorized, Comparable<ToDoItem> {
}
//endregion
- //region > scheduleExplicitly (action), scheduleImplicitly (background action)
- @ActionSemantics(Of.IDEMPOTENT)
- @Prototype
- public ToDoItem scheduleExplicitly() {
- backgroundService.execute(this).completeSlowly(2000);
- container.informUser("Task '" + getDescription() + "' scheduled for completion");
- return this;
- }
-
- @ActionSemantics(Of.IDEMPOTENT)
- @Command(executeIn=ExecuteIn.BACKGROUND)
- @Prototype
- public ToDoItem scheduleImplicitly() {
- completeSlowly(3000);
- return this;
- }
- //endregion
-
//region > openSourceCodeOnGithub (action)
@Prototype
@ActionSemantics(Of.SAFE)
public URL openSourceCodeOnGithub() throws MalformedURLException {
- return new URL("https://github.com/apache/isis/tree/master/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java");
+ return new URL("https://github.com/apache/isis/tree/master/example/application/${parentArtifactId}/dom/src/main/java/dom/todo/ToDoItem.java");
}
//endregion
@@ -676,34 +658,34 @@ public class ToDoItem implements Categorized, Comparable<ToDoItem> {
//region > lifecycle callbacks
public void created() {
- LOG.debug("lifecycle callback: created: " + container.titleOf(this));
+ LOG.debug("lifecycle callback: created: " + this.toString());
}
public void loaded() {
- LOG.debug("lifecycle callback: loaded: " + container.titleOf(this));
+ LOG.debug("lifecycle callback: loaded: " + this.toString());
}
public void persisting() {
- LOG.debug("lifecycle callback: persisting: " + container.titleOf(this));
+ LOG.debug("lifecycle callback: persisting: " + this.toString());
}
public void persisted() {
- LOG.debug("lifecycle callback: persisted: " + container.titleOf(this));
+ LOG.debug("lifecycle callback: persisted: " + this.toString());
}
public void updating() {
- LOG.debug("lifecycle callback: updating: " + container.titleOf(this));
+ LOG.debug("lifecycle callback: updating: " + this.toString());
}
public void updated() {
- LOG.debug("lifecycle callback: updated: " + container.titleOf(this));
+ LOG.debug("lifecycle callback: updated: " + this.toString());
}
public void removing() {
- LOG.debug("lifecycle callback: removing: " + container.titleOf(this));
+ LOG.debug("lifecycle callback: removing: " + this.toString());
}
public void removed() {
- LOG.debug("lifecycle callback: removed: " + container.titleOf(this));
+ LOG.debug("lifecycle callback: removed: " + this.toString());
}
//endregion
@@ -795,15 +777,15 @@ public class ToDoItem implements Categorized, Comparable<ToDoItem> {
};
}
- public static Predicate<ToDoItem> thoseCompleted(
- final boolean completed) {
+ public static Predicate<ToDoItem> thoseCompleted(
+ final boolean completed) {
return new Predicate<ToDoItem>() {
@Override
public boolean apply(final ToDoItem t) {
return Objects.equal(t.isComplete(), completed);
}
};
- }
+ }
public static Predicate<ToDoItem> thoseWithSimilarDescription(final String description) {
return new Predicate<ToDoItem>() {
@@ -862,7 +844,6 @@ public class ToDoItem implements Categorized, Comparable<ToDoItem> {
//endregion
//region > toString, compareTo
- // ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@Override
public String toString() {
return ObjectContracts.toString(this, "description,complete,dueBy,ownedBy");
@@ -875,33 +856,20 @@ public class ToDoItem implements Categorized, Comparable<ToDoItem> {
public int compareTo(final ToDoItem other) {
return ObjectContracts.compare(this, other, "complete,dueBy,description");
}
- // ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//endregion
//region > injected services
- // ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@javax.inject.Inject
private DomainObjectContainer container;
@javax.inject.Inject
private ToDoItems toDoItems;
- @javax.inject.Inject
- @SuppressWarnings("unused")
- private ClockService clockService;
-
Bulk.InteractionContext bulkInteractionContext;
public void injectBulkInteractionContext(Bulk.InteractionContext bulkInteractionContext) {
this.bulkInteractionContext = bulkInteractionContext;
}
- @SuppressWarnings("unused")
- @javax.inject.Inject
- private CommandContext commandContext;
-
- @javax.inject.Inject
- private BackgroundService backgroundService;
-
@javax.inject.Inject
private Scratchpad scratchpad;
@@ -913,7 +881,6 @@ public class ToDoItem implements Categorized, Comparable<ToDoItem> {
@javax.inject.Inject
private WrapperFactory wrapperFactory;
- // ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//endregion
}
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItem.png
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItem.png b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItem.png
new file mode 100644
index 0000000..99a9fed
Binary files /dev/null and b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItem.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItemSubscriptions.java
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItemSubscriptions.java b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItemSubscriptions.java
index dab085e..1230090 100644
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItemSubscriptions.java
+++ b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItemSubscriptions.java
@@ -118,7 +118,7 @@ public class ToDoItemSubscriptions {
case EXECUTING:
break;
case EXECUTED:
- LOG.info("Received ToDoItem.CompletedEvent for : " + container.titleOf(ev.getSource()));
+ LOG.info("Received ToDoItem.CompletedEvent for : " + ev.getSource().toString());
break;
}
}
@@ -154,7 +154,7 @@ public class ToDoItemSubscriptions {
case EXECUTING:
break;
case EXECUTED:
- LOG.info("Received ActionInteractionEvent, " + container.titleOf(ev.getSource()) + ", invoked " + ev.getIdentifier().getMemberName());
+ LOG.info("Received ActionInteractionEvent, " + ev.getSource().toString() + ", invoked " + ev.getIdentifier().getMemberName());
onExecutedVetoIfRequired();
break;
}
@@ -186,7 +186,7 @@ public class ToDoItemSubscriptions {
case EXECUTING:
break;
case EXECUTED:
- LOG.info("Received PropertyInteractionEvent, " + container.titleOf(ev.getSource()) + ", changed " + ev.getIdentifier().getMemberName() + " : " + ev.getOldValue() + " -> " + ev.getNewValue());
+ LOG.info("Received PropertyInteractionEvent, " + ev.getSource().toString() + ", changed " + ev.getIdentifier().getMemberName() + " : " + ev.getOldValue() + " -> " + ev.getNewValue());
onExecutedVetoIfRequired();
if(ev.getIdentifier().getMemberName().contains("description")) {
@@ -236,9 +236,9 @@ public class ToDoItemSubscriptions {
break;
case EXECUTED:
if(ev.getOf() == CollectionInteractionEvent.Of.ADD_TO) {
- LOG.info("Received CollectionInteractionEvent, " + container.titleOf(ev.getSource()) + ", added to " + ev.getIdentifier().getMemberName() + " : " + ev.getValue());
+ LOG.info("Received CollectionInteractionEvent, " + ev.getSource().toString() + ", added to " + ev.getIdentifier().getMemberName() + " : " + ev.getValue());
} else {
- LOG.info("Received CollectionInteractionEvent, " + container.titleOf(ev.getSource()) + ", removed from " + ev.getIdentifier().getMemberName() + " : " + ev.getValue());
+ LOG.info("Received CollectionInteractionEvent, " + ev.getSource().toString() + ", removed from " + ev.getIdentifier().getMemberName() + " : " + ev.getValue());
}
onExecutedVetoIfRequired();
break;
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItems.java
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItems.java b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItems.java
index bee7631..07d3c66 100644
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItems.java
+++ b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItems.java
@@ -38,16 +38,6 @@ import org.apache.isis.applib.services.clock.ClockService;
@DomainService(menuOrder = "10", repositoryFor = ToDoItem.class)
public class ToDoItems {
- //region > identification in the UI
- public String getId() {
- return "toDoItems";
- }
-
- public String iconName() {
- return "ToDoItem";
- }
- //endregion
-
//region > notYetComplete (action)
@Bookmarkable
@ActionSemantics(Of.SAFE)
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/resources/images/Dashboard.png
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/resources/images/Dashboard.png b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/resources/images/Dashboard.png
deleted file mode 100644
index c22ab2b..0000000
Binary files a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/resources/images/Dashboard.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/resources/images/ToDoItem-done.png
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/resources/images/ToDoItem-done.png b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/resources/images/ToDoItem-done.png
deleted file mode 100644
index b0fc6e8..0000000
Binary files a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/resources/images/ToDoItem-done.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/resources/images/ToDoItem-todo.png
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/resources/images/ToDoItem-todo.png b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/resources/images/ToDoItem-todo.png
deleted file mode 100644
index 99a9fed..0000000
Binary files a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/resources/images/ToDoItem-todo.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/resources/images/ToDoItem.png
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/resources/images/ToDoItem.png b/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/resources/images/ToDoItem.png
deleted file mode 100644
index 99a9fed..0000000
Binary files a/example/archetype/todoapp/src/main/resources/archetype-resources/dom/src/main/resources/images/ToDoItem.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/fixture/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/fixture/pom.xml b/example/archetype/todoapp/src/main/resources/archetype-resources/fixture/pom.xml
index d75a856..478ac42 100644
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/fixture/pom.xml
+++ b/example/archetype/todoapp/src/main/resources/archetype-resources/fixture/pom.xml
@@ -17,22 +17,22 @@
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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>${groupId}</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>${rootArtifactId}</artifactId>
<version>${version}</version>
</parent>
- <artifactId>${artifactId}</artifactId>
- <name>ToDo App Fixtures</name>
+ <artifactId>${artifactId}</artifactId>
+ <name>ToDo App Fixtures</name>
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>${rootArtifactId}-dom</artifactId>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${rootArtifactId}-dom</artifactId>
+ </dependency>
+ </dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/fixture/src/main/java/fixture/todo/ToDoItemsFixturesService.java
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/fixture/src/main/java/fixture/todo/ToDoItemsFixturesService.java b/example/archetype/todoapp/src/main/resources/archetype-resources/fixture/src/main/java/fixture/todo/ToDoItemsFixturesService.java
index da1c7c3..dcaa956 100644
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/fixture/src/main/java/fixture/todo/ToDoItemsFixturesService.java
+++ b/example/archetype/todoapp/src/main/resources/archetype-resources/fixture/src/main/java/fixture/todo/ToDoItemsFixturesService.java
@@ -43,7 +43,7 @@ public class ToDoItemsFixturesService extends FixtureScripts {
super("fixture.todo");
}
- //@Override // compatibility with core 1.5.0
+ @Override
public FixtureScript default0RunFixtureScript() {
return findFixtureScriptFor(RecreateToDoItemsAndCompleteSeveralForCurrent.class);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/fixture/src/main/java/fixture/todo/integtests/ToDoItemsIntegTestFixture.java
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/fixture/src/main/java/fixture/todo/integtests/ToDoItemsIntegTestFixture.java b/example/archetype/todoapp/src/main/resources/archetype-resources/fixture/src/main/java/fixture/todo/integtests/ToDoItemsIntegTestFixture.java
index d844083..3795f85 100644
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/fixture/src/main/java/fixture/todo/integtests/ToDoItemsIntegTestFixture.java
+++ b/example/archetype/todoapp/src/main/resources/archetype-resources/fixture/src/main/java/fixture/todo/integtests/ToDoItemsIntegTestFixture.java
@@ -37,7 +37,7 @@ public class ToDoItemsIntegTestFixture extends FixtureScript {
@Override
protected void execute(ExecutionContext executionContext) {
- execute(new ToDoItemsRecreateAndCompleteSeveral(null), executionContext);
+ executeChild(new ToDoItemsRecreateAndCompleteSeveral(null), executionContext);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/fixture/src/main/java/fixture/todo/simple/ToDoItemsRecreate.java
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/fixture/src/main/java/fixture/todo/simple/ToDoItemsRecreate.java b/example/archetype/todoapp/src/main/resources/archetype-resources/fixture/src/main/java/fixture/todo/simple/ToDoItemsRecreate.java
index 8f8077e..d6e1158 100644
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/fixture/src/main/java/fixture/todo/simple/ToDoItemsRecreate.java
+++ b/example/archetype/todoapp/src/main/resources/archetype-resources/fixture/src/main/java/fixture/todo/simple/ToDoItemsRecreate.java
@@ -51,7 +51,7 @@ public class ToDoItemsRecreate extends FixtureScript {
final String ownedBy = Util.coalesce(user, executionContext.getParameters(), getContainer().getUser().getName());
// prereqs
- execute(new ToDoItemsDelete(null), executionContext);
+ executeChild(new ToDoItemsDelete(null), executionContext);
// this fixture
createToDoItem("Buy milk", Category.Domestic, Subcategory.Shopping, ownedBy, nowPlusDays(0), new BigDecimal("0.75"), executionContext);
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/fixture/src/main/java/fixture/todo/simple/ToDoItemsRecreateAndCompleteSeveral.java
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/fixture/src/main/java/fixture/todo/simple/ToDoItemsRecreateAndCompleteSeveral.java b/example/archetype/todoapp/src/main/resources/archetype-resources/fixture/src/main/java/fixture/todo/simple/ToDoItemsRecreateAndCompleteSeveral.java
index b04bfd5..c7397bb 100644
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/fixture/src/main/java/fixture/todo/simple/ToDoItemsRecreateAndCompleteSeveral.java
+++ b/example/archetype/todoapp/src/main/resources/archetype-resources/fixture/src/main/java/fixture/todo/simple/ToDoItemsRecreateAndCompleteSeveral.java
@@ -48,7 +48,7 @@ public class ToDoItemsRecreateAndCompleteSeveral extends FixtureScript {
final String ownedBy = Util.coalesce(user, executionContext.getParameters(), getContainer().getUser().getName());
// prereqs
- execute(new ToDoItemsRecreate(null), executionContext);
+ executeChild(new ToDoItemsRecreate(null), executionContext);
// this fixture
complete(ownedBy, "Buy stamps", executionContext);
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/pom.xml b/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/pom.xml
index ba865c1..1396994 100644
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/pom.xml
+++ b/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/pom.xml
@@ -17,16 +17,16 @@
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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>${groupId}</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>${rootArtifactId}</artifactId>
<version>${version}</version>
</parent>
- <artifactId>${artifactId}</artifactId>
- <name>ToDo App Integration Tests</name>
+ <artifactId>${artifactId}</artifactId>
+ <name>ToDo App Integration Tests</name>
<build>
<testResources>
@@ -42,15 +42,15 @@
<exclude>**/*.java</exclude>
</excludes>
</testResource>
- </testResources>
+ </testResources>
</build>
- <dependencies>
-
- <!-- other modules in this project -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>${rootArtifactId}-fixture</artifactId>
- </dependency>
+ <dependencies>
+
+ <!-- other modules in this project -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${rootArtifactId}-fixture</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
@@ -65,7 +65,7 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-specsupport</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
@@ -105,7 +105,7 @@
<version>0.0.4</version>
</dependency>
-->
- </dependencies>
+ </dependencies>
<!--
uncomment for enhanced cucumber-jvm reporting
@@ -117,6 +117,6 @@
</repository>
</repositories>
-->
-
+
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/ToDoSystemInitializer.java
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/ToDoSystemInitializer.java b/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/ToDoSystemInitializer.java
index 70adfb8..000b712 100644
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/ToDoSystemInitializer.java
+++ b/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/ToDoSystemInitializer.java
@@ -21,6 +21,7 @@ package integration;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.integtestsupport.IsisSystemForTest;
+import org.apache.isis.core.runtime.persistence.PersistenceConstants;
import org.apache.isis.objectstore.jdo.datanucleus.DataNucleusPersistenceMechanismInstaller;
import org.apache.isis.objectstore.jdo.datanucleus.IsisConfigurationForJdoIntegTests;
@@ -66,6 +67,13 @@ public class ToDoSystemInitializer {
private static IsisConfiguration testConfiguration() {
final IsisConfigurationForJdoIntegTests testConfiguration = new IsisConfigurationForJdoIntegTests();
testConfiguration.addRegisterEntitiesPackagePrefix("dom");
+
+ // enable stricter checking
+ //
+ // the consequence of this is having to call 'nextTransaction()' between most of the given/when/then's
+ // because the command2 only ever refers to the event of the originating action.
+ testConfiguration.put(PersistenceConstants.ENFORCE_SAFE_SEMANTICS, "true");
+
return testConfiguration;
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/tests/ToDoItemContributionsIntegTest.java
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/tests/ToDoItemContributionsIntegTest.java b/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/tests/ToDoItemContributionsIntegTest.java
index c1b59ed..3500adb 100644
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/tests/ToDoItemContributionsIntegTest.java
+++ b/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/tests/ToDoItemContributionsIntegTest.java
@@ -30,6 +30,7 @@ import java.util.List;
import javax.inject.Inject;
import org.junit.Before;
import org.junit.Test;
+import org.apache.isis.applib.fixturescripts.FixtureScripts;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.is;
@@ -37,12 +38,17 @@ import static org.junit.Assert.assertThat;
public abstract class ToDoItemContributionsIntegTest extends AbstractToDoIntegTest {
+ ToDoItemsIntegTestFixture fixture;
+
@Before
public void setUpData() throws Exception {
- scenarioExecution().install(new ToDoItemsIntegTestFixture().withTracing());
+ // executing the fixtures directly allows us to look up the results later.
+ fixtureScripts.runFixtureScript(fixture = new ToDoItemsIntegTestFixture(), null);
}
@Inject
+ FixtureScripts fixtureScripts;
+ @Inject
ToDoItems toDoItems;
@Inject
ToDoItemContributions toDoItemContributions;
@@ -52,8 +58,8 @@ public abstract class ToDoItemContributionsIntegTest extends AbstractToDoIntegTe
@Before
public void setUp() throws Exception {
- final List<ToDoItem> all = toDoItems.notYetComplete();
- toDoItem = wrap(all.get(0));
+
+ toDoItem = wrap(fixture.lookup("integ-test/complete-current/create-current/item-2", ToDoItem.class));
toDoItemContributionsWrapped = wrap(toDoItemContributions);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/tests/ToDoItemIntegTest.java
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/tests/ToDoItemIntegTest.java b/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/tests/ToDoItemIntegTest.java
index 447070e..ccfd19c 100644
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/tests/ToDoItemIntegTest.java
+++ b/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/tests/ToDoItemIntegTest.java
@@ -45,6 +45,7 @@ import org.junit.Test;
import org.apache.isis.applib.NonRecoverableException;
import org.apache.isis.applib.RecoverableException;
import org.apache.isis.applib.clock.Clock;
+import org.apache.isis.applib.fixturescripts.FixtureScripts;
import org.apache.isis.applib.services.clock.ClockService;
import org.apache.isis.applib.services.eventbus.*;
import org.apache.isis.applib.value.Blob;
@@ -55,12 +56,17 @@ import static org.junit.Assert.assertTrue;
public class ToDoItemIntegTest extends AbstractToDoIntegTest {
+ ToDoItemsIntegTestFixture fixture;
+
@Before
public void setUpData() throws Exception {
- scenarioExecution().install(new ToDoItemsIntegTestFixture());
+ // executing the fixtures directly allows us to look up the results later.
+ fixtureScripts.runFixtureScript(fixture = new ToDoItemsIntegTestFixture(), null);
}
@Inject
+ FixtureScripts fixtureScripts;
+ @Inject
ToDoItems toDoItems;
@Inject
ToDoItemSubscriptions toDoItemSubscriptions;
@@ -85,9 +91,14 @@ public class ToDoItemIntegTest extends AbstractToDoIntegTest {
@Before
public void setUp() throws Exception {
+ super.setUp();
final List<ToDoItem> all = wrap(toDoItems).notYetComplete();
toDoItem = wrap(all.get(0));
+ toDoItem = wrap(fixture.lookup("integ-test/complete-current/create-current/item-2", ToDoItem.class));
+
+ nextTransaction();
+
dueBy = toDoItem.getDueBy();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/tests/ToDoItemsIntegTest.java
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/tests/ToDoItemsIntegTest.java b/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/tests/ToDoItemsIntegTest.java
index c95e9c0..7f8d2a6 100644
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/tests/ToDoItemsIntegTest.java
+++ b/example/archetype/todoapp/src/main/resources/archetype-resources/integtests/src/test/java/integration/tests/ToDoItemsIntegTest.java
@@ -31,19 +31,26 @@ import org.hamcrest.Matchers;
import org.junit.Before;
import org.junit.Test;
+import org.apache.isis.applib.fixturescripts.FixtureScripts;
+
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
public class ToDoItemsIntegTest extends AbstractToDoIntegTest {
@Inject
+ FixtureScripts fixtureScripts;
+ @Inject
ToDoItems toDoItems;
public static class Finders extends ToDoItemsIntegTest {
+ ToDoItemsIntegTestFixture fixture;
+
@Before
public void setUpData() throws Exception {
- scenarioExecution().install(new ToDoItemsIntegTestFixture());
+ // executing the fixtures directly allows us to look up the results later.
+ fixtureScripts.runFixtureScript(fixture = new ToDoItemsIntegTestFixture(), null);
}
private int notYetCompletedSize;
@@ -51,6 +58,8 @@ public class ToDoItemsIntegTest extends AbstractToDoIntegTest {
@Before
public void setUp() throws Exception {
+
+ // could use fixture${symbol_pound}lookup(...), but can also just search directly.
final List<ToDoItem> notYetCompleteItems = wrap(toDoItems).notYetComplete();
final List<ToDoItem> completedItems = wrap(toDoItems).complete();
@@ -64,22 +73,26 @@ public class ToDoItemsIntegTest extends AbstractToDoIntegTest {
public void complete_and_notYetComplete() throws Exception {
// given
- List<ToDoItem> notYetCompleteItems = wrap(service(ToDoItems.class)).notYetComplete();
+ List<ToDoItem> notYetCompleteItems = wrap(toDoItems).notYetComplete();
final ToDoItem toDoItem = wrap(notYetCompleteItems.get(0));
+ nextTransaction();
// when
toDoItem.completed();
+ nextTransaction();
// then
- assertThat(wrap(service(ToDoItems.class)).notYetComplete().size(), is(notYetCompletedSize-1));
- assertThat(wrap(service(ToDoItems.class)).complete().size(), is(completedSize+1));
+ assertThat(wrap(toDoItems).notYetComplete().size(), is(notYetCompletedSize-1));
+ assertThat(wrap(toDoItems).complete().size(), is(completedSize+1));
+ nextTransaction();
// and when
toDoItem.notYetCompleted();
+ nextTransaction();
// then
- assertThat(wrap(service(ToDoItems.class)).notYetComplete().size(), is(notYetCompletedSize));
- assertThat(wrap(service(ToDoItems.class)).complete().size(), is(completedSize));
+ assertThat(wrap(toDoItems).notYetComplete().size(), is(notYetCompletedSize));
+ assertThat(wrap(toDoItems).complete().size(), is(completedSize));
}
}
@@ -95,20 +108,27 @@ public class ToDoItemsIntegTest extends AbstractToDoIntegTest {
// given
int size = wrap(toDoItems).notYetComplete().size();
+ nextTransaction();
// when
final ToDoItem newToDo = toDoItems.newToDo("new todo", ToDoItem.Category.Professional, ToDoItem.Subcategory.OpenSource, null, null);
+ nextTransaction();
// then
assertThat(newToDo.getDescription(), is("new todo"));
assertThat(newToDo.getCategory(), is(ToDoItem.Category.Professional));
- assertThat(wrap(service(ToDoItems.class)).notYetComplete().size(), is(size+1));
+ assertThat(wrap(toDoItems).notYetComplete().size(), is(size+1));
+ assertThat(container().isPersistent(newToDo), is(true));
+ assertThat(container().isPersistent(wrap(newToDo)), is(true));
+
+ nextTransaction();
// when
newToDo.delete();
+ nextTransaction();
// then
- assertThat(wrap(service(ToDoItems.class)).notYetComplete().size(), is(size));
+ assertThat(wrap(toDoItems).notYetComplete().size(), is(size));
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/pom.xml b/example/archetype/todoapp/src/main/resources/archetype-resources/pom.xml
index 8b6ee60..d15570e 100644
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/pom.xml
+++ b/example/archetype/todoapp/src/main/resources/archetype-resources/pom.xml
@@ -32,15 +32,13 @@
</prerequisites>
<properties>
- <isis.version>1.6.0</isis.version>
- <isis-viewer-wicket.version>1.6.0</isis-viewer-wicket.version>
+ <isis.version>1.7.0</isis.version>
+ <isis-viewer-wicket.version>1.7.0</isis-viewer-wicket.version>
<!-- must be consistent with the versions defined by the JDO Objectstore -->
<datanucleus-accessplatform-jdo-rdbms.version>3.3.6</datanucleus-accessplatform-jdo-rdbms.version>
<datanucleus-maven-plugin.version>3.3.2</datanucleus-maven-plugin.version>
-
- <quartz-scheduler.version>2.2.1</quartz-scheduler.version>
-
+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
@@ -87,9 +85,14 @@
<version>2.16</version>
<configuration>
<includes>
- <include>**/*.java</include>
+ <include>**/*Test.java</include>
+ <include>**/*Test$*.java</include>
+ <include>**/*Test_*.java</include>
+ <include>**/*Spec*.java</include>
</includes>
<excludes>
+ <exclude>**/Test*.java</exclude>
+ <exclude>**/*ForTesting.java</exclude>
<exclude>**/*Abstract*.java</exclude>
</excludes>
<useFile>true</useFile>
@@ -105,6 +108,7 @@
<configuration>
<includes>
<include>**/*Test.java</include>
+ <include>**/*Test$*.java</include>
<include>**/*Test_*.java</include>
<include>**/*Spec*.java</include>
</includes>
@@ -198,7 +202,8 @@
<exclude>**/*.project</exclude>
<exclude>**/.classpath</exclude>
<exclude>**/.settings/**</exclude>
- <exclude>**/*.launch</exclude>
+ <exclude>**/ide/eclipse/launch/**</exclude>
+ <exclude>**/ide/intellij/launch/**</exclude>
<exclude>src/site/resources/ide/eclipse/**</exclude>
<exclude>**/rebel.xml</exclude>
@@ -329,19 +334,6 @@
</dependency>
- <!-- quartz scheduler integration -->
-
- <dependency>
- <groupId>org.quartz-scheduler</groupId>
- <artifactId>quartz</artifactId>
- <version>${quartz-scheduler.version}</version>
- </dependency>
- <dependency>
- <groupId>org.quartz-scheduler</groupId>
- <artifactId>quartz-jobs</artifactId>
- <version>${quartz-scheduler.version}</version>
- </dependency>
-
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/pom.xml b/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/pom.xml
index 9fafe06..c4bdfc4 100644
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/pom.xml
+++ b/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/pom.xml
@@ -184,45 +184,10 @@
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-profilestore</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security</artifactId>
</dependency>
- <!-- isis modules -->
- <dependency>
- <groupId>org.apache.isis.module</groupId>
- <artifactId>isis-module-background</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.module</groupId>
- <artifactId>isis-module-devutils-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.module</groupId>
- <artifactId>isis-module-audit-jdo</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.module</groupId>
- <artifactId>isis-module-command-jdo</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.module</groupId>
- <artifactId>isis-module-publishing-jdo</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.module</groupId>
- <artifactId>isis-module-publishingeventserializer-ro</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.module</groupId>
- <artifactId>isis-module-settings-impl-jdo</artifactId>
- </dependency>
-
-
<!-- to run using WebServer (optional) -->
<dependency>
<groupId>org.apache.isis.core</groupId>
@@ -285,17 +250,6 @@
</exclusions>
</dependency>
-
- <!-- quartz scheduler integration -->
- <dependency>
- <groupId>org.quartz-scheduler</groupId>
- <artifactId>quartz</artifactId>
- </dependency>
- <dependency>
- <groupId>org.quartz-scheduler</groupId>
- <artifactId>quartz-jobs</artifactId>
- </dependency>
-
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/ComponentFactoryRegistrarForToDoApp.java
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/ComponentFactoryRegistrarForToDoApp.java b/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/ComponentFactoryRegistrarForToDoApp.java
deleted file mode 100644
index 7f7f0cf..0000000
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/ComponentFactoryRegistrarForToDoApp.java
+++ /dev/null
@@ -1,36 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * 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 webapp;
-
-import com.google.inject.Singleton;
-
-import org.apache.isis.viewer.wicket.viewer.registries.components.ComponentFactoryRegistrarDefault;
-
-@Singleton
-public class ComponentFactoryRegistrarForToDoApp extends ComponentFactoryRegistrarDefault {
-
- @Override
- public void addComponentFactories(ComponentFactoryList componentFactories) {
- super.addComponentFactories(componentFactories);
- // currently no replacements
- }
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/CustomMementoService.java
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/CustomMementoService.java b/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/CustomMementoService.java
new file mode 100644
index 0000000..51f3db9
--- /dev/null
+++ b/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/CustomMementoService.java
@@ -0,0 +1,64 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+/*
+ * 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 webapp;
+
+import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.core.runtime.services.memento.MementoServiceDefault;
+
+
+/**
+ * Demonstrates how to register a replacement for one of the default framework-provided services.
+ *
+ * <p>
+ * In <code>isis.properties</code>, is registered using:
+ * </p>
+ *
+ * <pre>
+ * isis.services = ${symbol_escape}
+ * ...,
+ * 1:webapp.MyMementoService,
+ * ...,
+ * </pre>
+ * <p>
+ * that is, with a menuOrder of 1.
+ * </p>
+ */
+public class CustomMementoService extends MementoServiceDefault {
+
+ @Programmatic
+ @Override
+ public Memento create() {
+ return super.create();
+ }
+
+ @Programmatic
+ @Override
+ public Memento parse(String str) {
+ return super.parse(str);
+ }
+
+ @Programmatic
+ @Override
+ public boolean canSet(Object input) {
+ return super.canSet(input);
+ }
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/CustomRepresentationService.java
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/CustomRepresentationService.java b/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/CustomRepresentationService.java
new file mode 100644
index 0000000..08c2339
--- /dev/null
+++ b/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/CustomRepresentationService.java
@@ -0,0 +1,35 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+/*
+ * 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 webapp;
+
+import javax.ws.rs.core.Response;
+import org.apache.isis.viewer.restfulobjects.rendering.service.RepresentationServiceForRestfulObjects;
+
+public class CustomRepresentationService extends RepresentationServiceForRestfulObjects {
+
+ @Override
+ protected Response buildResponse(Response.ResponseBuilder responseBuilder) {
+ responseBuilder.header("X-ResponseGeneratedBy", getClass().getCanonicalName());
+ return super.buildResponse(responseBuilder);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/PageClassListForToDoApp.java
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/PageClassListForToDoApp.java b/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/PageClassListForToDoApp.java
deleted file mode 100644
index 442f055..0000000
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/PageClassListForToDoApp.java
+++ /dev/null
@@ -1,64 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/**
- * 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 webapp;
-
-import org.apache.wicket.Page;
-
-import org.apache.isis.viewer.wicket.ui.ComponentFactory;
-import org.apache.isis.viewer.wicket.viewer.registries.pages.PageClassListDefault;
-
-public class PageClassListForToDoApp extends PageClassListDefault {
-
- @Override
- protected Class<? extends Page> getSignInPageClass() {
- // no override
- return super.getSignInPageClass();
- }
-
- @Override
- protected Class<? extends Page> getHomePageClass() {
- // no override
- return super.getHomePageClass();
- }
-
- @Override
- protected Class<? extends Page> getAboutPageClass() {
- // no override
- return super.getAboutPageClass();
- }
-
- /**
- * More typically, override using custom {@link ComponentFactory}s.
- */
- @Override
- protected Class<? extends Page> getEntityPageClass() {
- // no override
- return super.getEntityPageClass();
- }
-
- /**
- * More typically, override using custom {@link ComponentFactory}s.
- */
- @Override
- protected Class<? extends Page> getActionPromptPageClass() {
- // no override
- return super.getActionPromptPageClass();
- }
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/ToDoApplication.java
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/ToDoApplication.java b/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/ToDoApplication.java
index 8b22730..459970c 100644
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/ToDoApplication.java
+++ b/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/ToDoApplication.java
@@ -25,9 +25,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.Charset;
import java.util.List;
-
import javax.servlet.http.HttpServletRequest;
-
import com.google.common.base.Joiner;
import com.google.common.io.Resources;
import com.google.inject.AbstractModule;
@@ -35,14 +33,10 @@ import com.google.inject.Module;
import com.google.inject.name.Names;
import com.google.inject.util.Modules;
import com.google.inject.util.Providers;
-
import org.apache.wicket.Session;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.Response;
import org.apache.wicket.request.http.WebRequest;
-
-import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistrar;
-import org.apache.isis.viewer.wicket.ui.pages.PageClassList;
import org.apache.isis.viewer.wicket.viewer.IsisWicketApplication;
import org.apache.isis.viewer.wicket.viewer.integration.wicket.AuthenticatedWebSessionForIsis;
@@ -114,31 +108,29 @@ public class ToDoApplication extends IsisWicketApplication {
protected Module newIsisWicketModule() {
final Module isisDefaults = super.newIsisWicketModule();
- final Module quickstartOverrides = new AbstractModule() {
+ final Module overrides = new AbstractModule() {
@Override
protected void configure() {
- bind(ComponentFactoryRegistrar.class).to(ComponentFactoryRegistrarForToDoApp.class);
- bind(PageClassList.class).to(PageClassListForToDoApp.class);
-
+
bind(String.class).annotatedWith(Names.named("applicationName")).toInstance("ToDo App");
bind(String.class).annotatedWith(Names.named("applicationCss")).toInstance("css/application.css");
bind(String.class).annotatedWith(Names.named("applicationJs")).toInstance("scripts/application.js");
- bind(String.class).annotatedWith(Names.named("welcomeMessage")).toInstance(readLines("welcome.html"));
+ bind(String.class).annotatedWith(Names.named("welcomeMessage")).toInstance(readLines(getClass(), "welcome.html"));
bind(String.class).annotatedWith(Names.named("aboutMessage")).toInstance("ToDo App");
bind(InputStream.class).annotatedWith(Names.named("metaInfManifest")).toProvider(Providers.of(getServletContext().getResourceAsStream("/META-INF/MANIFEST.MF")));
}
};
- return Modules.override(isisDefaults).with(quickstartOverrides);
+ return Modules.override(isisDefaults).with(overrides);
}
- private static String readLines(final String resourceName) {
+ private static String readLines(final Class<?> contextClass, final String resourceName) {
try {
- List<String> readLines = Resources.readLines(Resources.getResource(ToDoApplication.class, resourceName), Charset.defaultCharset());
+ List<String> readLines = Resources.readLines(Resources.getResource(contextClass, resourceName), Charset.defaultCharset());
final String aboutText = Joiner.on("${symbol_escape}n").join(readLines);
return aboutText;
} catch (IOException e) {
- return "This is Quick Start";
+ return "This is a Todo app";
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/ec94051e/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/admin/Admin.java
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/admin/Admin.java b/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/admin/Admin.java
deleted file mode 100644
index 9130c31..0000000
--- a/example/archetype/todoapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/admin/Admin.java
+++ /dev/null
@@ -1,176 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/**
- * 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 webapp.admin;
-
-import java.util.List;
-import java.util.UUID;
-import org.joda.time.LocalDate;
-import org.apache.isis.applib.AbstractService;
-import org.apache.isis.applib.annotation.*;
-import org.apache.isis.applib.annotation.ActionSemantics.Of;
-import org.apache.isis.applib.services.clock.ClockService;
-import org.apache.isis.objectstore.jdo.applib.service.audit.AuditEntryJdo;
-import org.apache.isis.objectstore.jdo.applib.service.audit.AuditingServiceJdoRepository;
-import org.apache.isis.objectstore.jdo.applib.service.command.CommandJdo;
-import org.apache.isis.objectstore.jdo.applib.service.command.CommandServiceJdoRepository;
-import org.apache.isis.objectstore.jdo.applib.service.publish.PublishedEventJdo;
-import org.apache.isis.objectstore.jdo.applib.service.publish.PublishingServiceJdoRepository;
-
-@DomainService(menuOrder = "35")
-public class Admin extends AbstractService {
-
-
- @ActionSemantics(Of.SAFE)
- @Bookmarkable
- @MemberOrder(sequence="10.1")
- public List<CommandJdo> commandsCurrentlyRunning() {
- return commandServiceRepository.findCurrent();
- }
- public boolean hideCommandsCurrentlyRunning() {
- return commandServiceRepository == null;
- }
-
- // //////////////////////////////////////
-
- @ActionSemantics(Of.SAFE)
- @MemberOrder(sequence="10.2")
- public List<CommandJdo> commandsPreviouslyRan() {
- return commandServiceRepository.findCompleted();
- }
- public boolean hideCommandsPreviouslyRan() {
- return commandServiceRepository == null;
- }
-
- // //////////////////////////////////////
-
- @MemberOrder(sequence="10.3")
- @ActionSemantics(Of.SAFE)
- public CommandJdo lookupCommand(
- final @Named("Transaction Id") UUID transactionId) {
- return commandServiceRepository.findByTransactionId(transactionId);
- }
- public boolean hideLookupCommand() {
- return commandServiceRepository == null;
- }
-
- // //////////////////////////////////////
-
- @ActionSemantics(Of.SAFE)
- @MemberOrder(sequence="10.4")
- public List<CommandJdo> findCommands(
- final @Optional @Named("From") LocalDate from,
- final @Optional @Named("To") LocalDate to) {
- return commandServiceRepository.findByFromAndTo(from, to);
- }
- public boolean hideFindCommands() {
- return commandServiceRepository == null;
- }
- public LocalDate default0FindCommands() {
- return clockService.now().minusDays(7);
- }
- public LocalDate default1FindCommands() {
- return clockService.now();
- }
-
-
- // //////////////////////////////////////
-
- @ActionSemantics(Of.SAFE)
- @MemberOrder(sequence="20.1")
- public List<AuditEntryJdo> findAuditEntries(
- final @Optional @Named("From") LocalDate from,
- final @Optional @Named("To") LocalDate to) {
- return auditingServiceRepository.findByFromAndTo(from, to);
- }
- public boolean hideFindAuditEntries() {
- return auditingServiceRepository == null;
- }
- public LocalDate default0FindAuditEntries() {
- return clockService.now().minusDays(7);
- }
- public LocalDate default1FindAuditEntries() {
- return clockService.now();
- }
-
- // //////////////////////////////////////
-
-
- @ActionSemantics(Of.SAFE)
- @MemberOrder(sequence="30.1")
- public List<PublishedEventJdo> allQueuedEvents() {
- return publishingServiceRepository.findQueued();
- }
- public boolean hideAllQueuedEvents() {
- return publishingServiceRepository == null;
- }
-
- @ActionSemantics(Of.SAFE)
- @Prototype
- @MemberOrder(sequence="30.2")
- public List<PublishedEventJdo> allProcessedEvents() {
- return publishingServiceRepository.findProcessed();
- }
- public boolean hideAllProcessedEvents() {
- return publishingServiceRepository == null;
- }
-
- @ActionSemantics(Of.IDEMPOTENT)
- @MemberOrder(sequence="30.3")
- public void purgeProcessedEvents() {
- publishingServiceRepository.purgeProcessed();
- }
- public boolean hidePurgeProcessedEvents() {
- return publishingServiceRepository == null;
- }
-
- @ActionSemantics(Of.SAFE)
- @MemberOrder(sequence="30.4")
- public List<PublishedEventJdo> findPublishedEvents(
- final @Optional @Named("From") LocalDate from,
- final @Optional @Named("To") LocalDate to) {
- return publishingServiceRepository.findByFromAndTo(from, to);
- }
- public boolean hideFindPublishedEvents() {
- return publishingServiceRepository == null;
- }
- public LocalDate default0FindPublishedEvents() {
- return clockService.now().minusDays(7);
- }
- public LocalDate default1FindPublishedEvents() {
- return clockService.now();
- }
-
-
- // //////////////////////////////////////
-
- @javax.inject.Inject
- private CommandServiceJdoRepository commandServiceRepository;
-
- @javax.inject.Inject
- private AuditingServiceJdoRepository auditingServiceRepository;
-
- @javax.inject.Inject
- private PublishingServiceJdoRepository publishingServiceRepository;
-
- @javax.inject.Inject
- private ClockService clockService;
-
-}
-
[22/24] git commit: Merge branch 'prepare/isis-1.7.0'
Posted by da...@apache.org.
Merge branch 'prepare/isis-1.7.0'
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/74821b8d
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/74821b8d
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/74821b8d
Branch: refs/heads/master
Commit: 74821b8d1bd5a1fdf5f58df67c9b7abf28ee6fb9
Parents: b60eb22 dd955f9
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sun Oct 19 10:04:27 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sun Oct 19 10:04:27 2014 +0100
----------------------------------------------------------------------
component/viewer/wicket/applib/pom.xml | 2 +-
component/viewer/wicket/impl/pom.xml | 2 +-
.../imagecache/ImageResourceCacheKeyTest.java | 18 +
component/viewer/wicket/model/pom.xml | 2 +-
component/viewer/wicket/pom.xml | 18 +-
component/viewer/wicket/tck/pom.xml | 6 +-
component/viewer/wicket/ui/pom.xml | 2 +-
.../viewer/wicket/ui/errors/JGrowlUtilTest.java | 18 +
.../wicket/ui/pages/PageAbstractTest.java | 18 +
core/applib/pom.xml | 2 +-
.../command/Command2ContractTestAbstract.java | 18 +
.../services/command/CommandDefaultTest.java | 18 +
.../ExceptionRecognizerCompositeTest.java | 1 -
core/bytecode-cglib/pom.xml | 2 +-
core/bytecode-javassist/pom.xml | 2 +-
core/integtestsupport/pom.xml | 2 +-
core/log4j/pom.xml | 2 +-
core/metamodel/pom.xml | 2 +-
core/objectstore-inmemory/pom.xml | 2 +-
core/objectstore-jdo-datanucleus/pom.xml | 2 +-
core/objectstore-jdo-metamodel/pom.xml | 2 +-
core/pom.xml | 71 +-
core/runtime/pom.xml | 2 +-
core/security-noop/pom.xml | 2 +-
core/security-shiro/pom.xml | 6 +-
core/specsupport/pom.xml | 2 +-
core/tck/pom.xml | 2 +-
core/tck/tck-dom/pom.xml | 2 +-
core/tck/tck-fixture/pom.xml | 2 +-
core/tck/tck-viewer-restfulobjects/pom.xml | 2 +-
core/unittestsupport/pom.xml | 2 +-
core/viewer-restfulobjects-applib/pom.xml | 2 +-
core/viewer-restfulobjects-rendering/pom.xml | 2 +-
core/viewer-restfulobjects-server/pom.xml | 2 +-
core/webserver/pom.xml | 2 +-
core/wrapper/pom.xml | 2 +-
example/application/simpleapp/pom.xml | 6 +-
.../simpleapp/webapp/coverage-error.log | 585 ---------
.../dom/src/main/java/dom/todo/ToDoItem.java | 9 +-
example/application/todoapp/pom.xml | 7 +-
.../todoapp/webapp/coverage-error.log | 1170 ------------------
example/archetype/simpleapp/pom.xml | 4 +-
.../META-INF/maven/archetype-metadata.xml | 9 +-
.../resources/archetype-resources/dom/pom.xml | 112 +-
.../src/main/java/dom/simple/SimpleObject.java | 6 +-
.../java/dom/simple/SimpleObject.layout.json | 50 +-
.../src/main/java/dom/simple/SimpleObject.png | Bin 0 -> 557 bytes
.../src/main/java/dom/simple/SimpleObjects.java | 24 +-
.../src/main/resources/images/SimpleObject.png | Bin 557 -> 0 bytes
.../java/dom/simple/SimpleObjectTest_name.java | 9 +-
.../dom/simple/SimpleObjectsTest_create.java | 10 +-
.../archetype-resources/fixture/pom.xml | 20 +-
.../fixture/simple/SimpleObjectsFixture.java | 2 +-
.../archetype-resources/integtests/pom.xml | 30 +-
.../integration/SimpleAppSystemInitializer.java | 5 +
.../SimpleObjectsTest_listAll_and_create.java | 5 +-
.../main/resources/archetype-resources/pom.xml | 10 +-
.../ide/intellij/launch/SimpleApp_PROTOTYPE.xml | 1 -
.../launch/SimpleApp__enhance_only_.xml | 1 -
.../archetype-resources/webapp/pom.xml | 70 --
.../ComponentFactoryRegistrarForSimpleApp.java | 36 -
.../src/main/java/webapp/SimpleApplication.java | 26 +-
.../webapp/prototyping/DeveloperUtilities.java | 53 -
.../WEB-INF/authentication_file.passwords | 28 -
.../WEB-INF/authentication_file.properties | 28 -
.../webapp/WEB-INF/authorization_file.allow | 28 -
.../WEB-INF/authorization_file.properties | 50 -
.../src/main/webapp/WEB-INF/isis.properties | 47 +-
.../main/webapp/WEB-INF/persistor.properties | 18 +-
.../WEB-INF/persistor_datanucleus.properties | 9 +-
.../webapp/WEB-INF/viewer_wicket.properties | 8 +
.../webapp/src/main/webapp/WEB-INF/web.xml | 2 +-
.../webapp/src/main/webapp/css/application.css | 1 -
.../projects/basic/archetype.properties | 2 +-
example/archetype/todoapp/pom.xml | 4 +-
.../META-INF/maven/archetype-metadata.xml | 10 +-
.../resources/archetype-resources/dom/pom.xml | 107 +-
.../dom/src/main/java/app/ToDoAppDashboard.java | 4 -
.../dom/src/main/java/app/ToDoAppDashboard.png | Bin 0 -> 684 bytes
.../dom/src/main/java/app/ToDoItemAnalysis.java | 10 +-
.../java/app/ToDoItemsByCategoryViewModel.java | 24 +-
.../java/app/ToDoItemsByDateRangeViewModel.java | 25 +-
.../src/main/java/dom/todo/ToDoItem-done.png | Bin 0 -> 1363 bytes
.../src/main/java/dom/todo/ToDoItem-todo.png | Bin 0 -> 971 bytes
.../dom/src/main/java/dom/todo/ToDoItem.java | 87 +-
.../dom/src/main/java/dom/todo/ToDoItem.png | Bin 0 -> 971 bytes
.../java/dom/todo/ToDoItemSubscriptions.java | 10 +-
.../dom/src/main/java/dom/todo/ToDoItems.java | 10 -
.../dom/src/main/resources/images/Dashboard.png | Bin 684 -> 0 bytes
.../src/main/resources/images/ToDoItem-done.png | Bin 1363 -> 0 bytes
.../src/main/resources/images/ToDoItem-todo.png | Bin 971 -> 0 bytes
.../dom/src/main/resources/images/ToDoItem.png | Bin 971 -> 0 bytes
.../archetype-resources/fixture/pom.xml | 20 +-
.../fixture/todo/ToDoItemsFixturesService.java | 2 +-
.../integtests/ToDoItemsIntegTestFixture.java | 2 +-
.../fixture/todo/simple/ToDoItemsRecreate.java | 2 +-
.../ToDoItemsRecreateAndCompleteSeveral.java | 2 +-
.../archetype-resources/integtests/pom.xml | 30 +-
.../java/integration/ToDoSystemInitializer.java | 8 +
.../tests/ToDoItemContributionsIntegTest.java | 12 +-
.../integration/tests/ToDoItemIntegTest.java | 13 +-
.../integration/tests/ToDoItemsIntegTest.java | 36 +-
.../main/resources/archetype-resources/pom.xml | 32 +-
.../archetype-resources/webapp/pom.xml | 46 -
.../ComponentFactoryRegistrarForToDoApp.java | 36 -
.../main/java/webapp/CustomMementoService.java | 64 +
.../webapp/CustomRepresentationService.java | 35 +
.../java/webapp/PageClassListForToDoApp.java | 64 -
.../src/main/java/webapp/ToDoApplication.java | 22 +-
.../src/main/java/webapp/admin/Admin.java | 176 ---
.../java/webapp/admin/AdminContributions.java | 110 --
.../webapp/prototyping/DeveloperUtilities.java | 53 -
.../prototyping/ExternalLinksService.java | 2 +-
.../webapp/scheduler/AbstractIsisQuartzJob.java | 96 --
.../BackgroundCommandExecutionQuartzJob.java | 31 -
.../webapp/scheduler/SchedulerConstants.java | 30 -
.../webapp/src/main/resources/webapp/realm1.ini | 29 +-
.../webapp/src/main/resources/webapp/realm2.ini | 66 -
.../webapp/scheduler/quartz-config.xml | 65 -
.../webapp/scheduler/quartz.properties | 28 -
.../WEB-INF/authentication_file.passwords | 28 -
.../WEB-INF/authentication_file.properties | 28 -
.../webapp/WEB-INF/authorization_file.allow | 28 -
.../WEB-INF/authorization_file.properties | 50 -
.../src/main/webapp/WEB-INF/isis.properties | 49 +-
.../main/webapp/WEB-INF/persistor.properties | 20 +-
.../WEB-INF/persistor_datanucleus.properties | 9 +-
.../webapp/src/main/webapp/WEB-INF/shiro.ini | 6 +-
.../webapp/WEB-INF/viewer_wicket.properties | 8 +
.../webapp/src/main/webapp/WEB-INF/web.xml | 21 +-
.../webapp/src/main/webapp/about/index.html | 14 +-
.../projects/basic/archetype.properties | 2 +-
132 files changed, 736 insertions(+), 3655 deletions(-)
----------------------------------------------------------------------
[20/24] git commit: [maven-release-plugin] prepare release
isis-1.7.0-RC2
Posted by da...@apache.org.
[maven-release-plugin] prepare release isis-1.7.0-RC2
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/dadf9d44
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/dadf9d44
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/dadf9d44
Branch: refs/heads/master
Commit: dadf9d44f5dfafda64eb6d7ef29aea720f24276b
Parents: 240b34d
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Oct 15 06:45:16 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Oct 15 06:45:16 2014 +0100
----------------------------------------------------------------------
core/applib/pom.xml | 2 +-
core/bytecode-cglib/pom.xml | 2 +-
core/bytecode-javassist/pom.xml | 4 +-
core/integtestsupport/pom.xml | 2 +-
core/log4j/pom.xml | 2 +-
core/metamodel/pom.xml | 2 +-
core/objectstore-inmemory/pom.xml | 2 +-
core/objectstore-jdo-datanucleus/pom.xml | 2 +-
core/objectstore-jdo-metamodel/pom.xml | 2 +-
core/pom.xml | 70 +++++++++++------------
core/runtime/pom.xml | 2 +-
core/security-noop/pom.xml | 2 +-
core/security-shiro/pom.xml | 6 +-
core/specsupport/pom.xml | 2 +-
core/tck/pom.xml | 2 +-
core/tck/tck-dom/pom.xml | 2 +-
core/tck/tck-fixture/pom.xml | 2 +-
core/tck/tck-viewer-restfulobjects/pom.xml | 2 +-
core/unittestsupport/pom.xml | 2 +-
core/viewer-restfulobjects-applib/pom.xml | 2 +-
core/viewer-restfulobjects-rendering/pom.xml | 2 +-
core/viewer-restfulobjects-server/pom.xml | 2 +-
core/webserver/pom.xml | 2 +-
core/wrapper/pom.xml | 2 +-
24 files changed, 61 insertions(+), 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/dadf9d44/core/applib/pom.xml
----------------------------------------------------------------------
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index fc1b23d..d1ef3be 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-core-applib</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/dadf9d44/core/bytecode-cglib/pom.xml
----------------------------------------------------------------------
diff --git a/core/bytecode-cglib/pom.xml b/core/bytecode-cglib/pom.xml
index 4c4eb6f..4f8decf 100644
--- a/core/bytecode-cglib/pom.xml
+++ b/core/bytecode-cglib/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-core-bytecode-cglib</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/dadf9d44/core/bytecode-javassist/pom.xml
----------------------------------------------------------------------
diff --git a/core/bytecode-javassist/pom.xml b/core/bytecode-javassist/pom.xml
index 9398006..70ba81d 100644
--- a/core/bytecode-javassist/pom.xml
+++ b/core/bytecode-javassist/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-core-bytecode-javassist</artifactId>
@@ -39,7 +39,7 @@
<connection>scm:svn:http://svn.apache.org/repos/asf/incubator/isis/trunk/runtimes/dflt/bytecode/javassist/</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/isis/trunk$/{relativeUrl}</developerConnection>
<url>http://svn.apache.org/repos/asf/incubator/isis/trunk/runtimes/dflt/bytecode/javassist/</url>
- <tag>HEAD</tag>
+ <tag>isis-1.7.0-RC2</tag>
</scm>
<!-- used in Site generation for relative references. -->
http://git-wip-us.apache.org/repos/asf/isis/blob/dadf9d44/core/integtestsupport/pom.xml
----------------------------------------------------------------------
diff --git a/core/integtestsupport/pom.xml b/core/integtestsupport/pom.xml
index 74aa99f..8ac9730 100644
--- a/core/integtestsupport/pom.xml
+++ b/core/integtestsupport/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-core-integtestsupport</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/dadf9d44/core/log4j/pom.xml
----------------------------------------------------------------------
diff --git a/core/log4j/pom.xml b/core/log4j/pom.xml
index ff14f31..ee0bbab 100644
--- a/core/log4j/pom.xml
+++ b/core/log4j/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-core-log4j</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/dadf9d44/core/metamodel/pom.xml
----------------------------------------------------------------------
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index 7d55d98..ff0a8c1 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-core-metamodel</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/dadf9d44/core/objectstore-inmemory/pom.xml
----------------------------------------------------------------------
diff --git a/core/objectstore-inmemory/pom.xml b/core/objectstore-inmemory/pom.xml
index be8f290..319c66c 100644
--- a/core/objectstore-inmemory/pom.xml
+++ b/core/objectstore-inmemory/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-core-objectstore</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/dadf9d44/core/objectstore-jdo-datanucleus/pom.xml
----------------------------------------------------------------------
diff --git a/core/objectstore-jdo-datanucleus/pom.xml b/core/objectstore-jdo-datanucleus/pom.xml
index 9dc8424..eff072c 100644
--- a/core/objectstore-jdo-datanucleus/pom.xml
+++ b/core/objectstore-jdo-datanucleus/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-core-objectstore-jdo-datanucleus</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/dadf9d44/core/objectstore-jdo-metamodel/pom.xml
----------------------------------------------------------------------
diff --git a/core/objectstore-jdo-metamodel/pom.xml b/core/objectstore-jdo-metamodel/pom.xml
index ef26089..61cc301 100644
--- a/core/objectstore-jdo-metamodel/pom.xml
+++ b/core/objectstore-jdo-metamodel/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-core-objectstore-jdo-metamodel</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/dadf9d44/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index b80e12c..afd286b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<packaging>pom</packaging>
@@ -153,7 +153,7 @@
<connection>scm:git:http://git.apache.org/isis.git/core</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/isis.git/trunk/framework/</developerConnection>
<url>git://git.apache.org/isis.git/core</url>
- <tag>HEAD</tag>
+ <tag>isis-1.7.0-RC2</tag>
</scm>
<!-- used in Site generation for relative references. -->
@@ -1031,13 +1031,13 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<!-- not scope=test, because referenced by some sql-tests-common under compile scope -->
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1046,14 +1046,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1062,7 +1062,7 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-log4j</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -1071,14 +1071,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1087,52 +1087,52 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-wrapper</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</dependency>
<!-- bytecode components -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-bytecode-cglib</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-bytecode-javassist</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</dependency>
<!-- webserver -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-webserver</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</dependency>
<!-- specsupport -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-specsupport</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</dependency>
<!-- integtestsupport -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-integtestsupport</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<!-- not scope=test, because referenced by some sql-tests-common under compile scope -->
</dependency>
@@ -1140,36 +1140,36 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-objectstore</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-objectstore</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-objectstore-jdo-metamodel</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-objectstore-jdo-metamodel</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-objectstore-jdo-datanucleus</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-objectstore-jdo-datanucleus</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
@@ -1179,36 +1179,36 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1218,12 +1218,12 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</dependency>
@@ -1231,22 +1231,22 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck-dom</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck-fixture</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck-viewer-restfulobjects</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/dadf9d44/core/runtime/pom.xml
----------------------------------------------------------------------
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index 62a7872..b3f3566 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-core-runtime</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/dadf9d44/core/security-noop/pom.xml
----------------------------------------------------------------------
diff --git a/core/security-noop/pom.xml b/core/security-noop/pom.xml
index 45e0963..27330d6 100644
--- a/core/security-noop/pom.xml
+++ b/core/security-noop/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-core-security</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/dadf9d44/core/security-shiro/pom.xml
----------------------------------------------------------------------
diff --git a/core/security-shiro/pom.xml b/core/security-shiro/pom.xml
index 19cbdf5..8773f4e 100644
--- a/core/security-shiro/pom.xml
+++ b/core/security-shiro/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<name>Isis Core Shiro Security</name>
@@ -102,7 +102,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/isis/blob/dadf9d44/core/specsupport/pom.xml
----------------------------------------------------------------------
diff --git a/core/specsupport/pom.xml b/core/specsupport/pom.xml
index 08c8577..734562f 100644
--- a/core/specsupport/pom.xml
+++ b/core/specsupport/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-core-specsupport</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/dadf9d44/core/tck/pom.xml
----------------------------------------------------------------------
diff --git a/core/tck/pom.xml b/core/tck/pom.xml
index a0c97f1..7ff657b 100644
--- a/core/tck/pom.xml
+++ b/core/tck/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-core-tck</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/dadf9d44/core/tck/tck-dom/pom.xml
----------------------------------------------------------------------
diff --git a/core/tck/tck-dom/pom.xml b/core/tck/tck-dom/pom.xml
index 9eda65d..9404cfd 100644
--- a/core/tck/tck-dom/pom.xml
+++ b/core/tck/tck-dom/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-core-tck-dom</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/dadf9d44/core/tck/tck-fixture/pom.xml
----------------------------------------------------------------------
diff --git a/core/tck/tck-fixture/pom.xml b/core/tck/tck-fixture/pom.xml
index 1b07b55..197f2bd 100644
--- a/core/tck/tck-fixture/pom.xml
+++ b/core/tck/tck-fixture/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-core-tck-fixture</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/dadf9d44/core/tck/tck-viewer-restfulobjects/pom.xml
----------------------------------------------------------------------
diff --git a/core/tck/tck-viewer-restfulobjects/pom.xml b/core/tck/tck-viewer-restfulobjects/pom.xml
index 8a5960a..878995a 100644
--- a/core/tck/tck-viewer-restfulobjects/pom.xml
+++ b/core/tck/tck-viewer-restfulobjects/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-core-tck-viewer-restfulobjects</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/dadf9d44/core/unittestsupport/pom.xml
----------------------------------------------------------------------
diff --git a/core/unittestsupport/pom.xml b/core/unittestsupport/pom.xml
index d860a23..b37f0bd 100644
--- a/core/unittestsupport/pom.xml
+++ b/core/unittestsupport/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-core-unittestsupport</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/dadf9d44/core/viewer-restfulobjects-applib/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/pom.xml b/core/viewer-restfulobjects-applib/pom.xml
index 9a790c2..6aaa7d8 100644
--- a/core/viewer-restfulobjects-applib/pom.xml
+++ b/core/viewer-restfulobjects-applib/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/dadf9d44/core/viewer-restfulobjects-rendering/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/pom.xml b/core/viewer-restfulobjects-rendering/pom.xml
index 26898e3..e4c8e31 100644
--- a/core/viewer-restfulobjects-rendering/pom.xml
+++ b/core/viewer-restfulobjects-rendering/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/dadf9d44/core/viewer-restfulobjects-server/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/pom.xml b/core/viewer-restfulobjects-server/pom.xml
index 29014c6..8d51e89 100644
--- a/core/viewer-restfulobjects-server/pom.xml
+++ b/core/viewer-restfulobjects-server/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/dadf9d44/core/webserver/pom.xml
----------------------------------------------------------------------
diff --git a/core/webserver/pom.xml b/core/webserver/pom.xml
index 36b86c0..a080080 100644
--- a/core/webserver/pom.xml
+++ b/core/webserver/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-core-webserver</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/dadf9d44/core/wrapper/pom.xml
----------------------------------------------------------------------
diff --git a/core/wrapper/pom.xml b/core/wrapper/pom.xml
index 565b4d0..0752eff 100644
--- a/core/wrapper/pom.xml
+++ b/core/wrapper/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-core-wrapper</artifactId>
[06/24] git commit: [maven-release-plugin] prepare release
isis-viewer-wicket-1.7.0-RC1
Posted by da...@apache.org.
[maven-release-plugin] prepare release isis-viewer-wicket-1.7.0-RC1
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e8ce620b
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e8ce620b
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e8ce620b
Branch: refs/heads/master
Commit: e8ce620b36f5045bba593d0b19fdb26b3349f18f
Parents: b0bbaef
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Oct 13 22:08:12 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Oct 13 22:08:12 2014 +0100
----------------------------------------------------------------------
component/viewer/wicket/applib/pom.xml | 2 +-
component/viewer/wicket/impl/pom.xml | 2 +-
component/viewer/wicket/model/pom.xml | 2 +-
component/viewer/wicket/pom.xml | 20 ++++++++++++--------
component/viewer/wicket/tck/pom.xml | 8 ++++++--
component/viewer/wicket/ui/pom.xml | 2 +-
6 files changed, 22 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/e8ce620b/component/viewer/wicket/applib/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/applib/pom.xml b/component/viewer/wicket/applib/pom.xml
index 6c079f6..30bf4e7 100644
--- a/component/viewer/wicket/applib/pom.xml
+++ b/component/viewer/wicket/applib/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-viewer-wicket-applib</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/e8ce620b/component/viewer/wicket/impl/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/pom.xml b/component/viewer/wicket/impl/pom.xml
index 7e98dff..e4ff1c8 100644
--- a/component/viewer/wicket/impl/pom.xml
+++ b/component/viewer/wicket/impl/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<name>Isis Wicket Viewer Implementation</name>
http://git-wip-us.apache.org/repos/asf/isis/blob/e8ce620b/component/viewer/wicket/model/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/model/pom.xml b/component/viewer/wicket/model/pom.xml
index 9093154..fa6a4af 100644
--- a/component/viewer/wicket/model/pom.xml
+++ b/component/viewer/wicket/model/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-viewer-wicket-model</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/e8ce620b/component/viewer/wicket/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/pom.xml b/component/viewer/wicket/pom.xml
index 03ea938..5d70350 100644
--- a/component/viewer/wicket/pom.xml
+++ b/component/viewer/wicket/pom.xml
@@ -30,7 +30,7 @@
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<name>Isis Wicket Viewer</name>
@@ -101,41 +101,41 @@
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-applib</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-model</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-model</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-ui</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-ui</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-impl</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-impl</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
@@ -321,4 +321,8 @@
</dependencies>
</dependencyManagement>
+
+ <scm>
+ <tag>isis-viewer-wicket-1.7.0-RC1</tag>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/e8ce620b/component/viewer/wicket/tck/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/tck/pom.xml b/component/viewer/wicket/tck/pom.xml
index 05cce33..ceca4f7 100644
--- a/component/viewer/wicket/tck/pom.xml
+++ b/component/viewer/wicket/tck/pom.xml
@@ -29,13 +29,13 @@
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-tck</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<name>Isis Wicket Viewer TCK tests</name>
<properties>
- <isis-viewer-wicket.version>1.7.0-SNAPSHOT</isis-viewer-wicket.version>
+ <isis-viewer-wicket.version>1.7.0</isis-viewer-wicket.version>
<siteBaseDir>..</siteBaseDir>
<relativeUrl>wicket-tck/</relativeUrl>
<!-- until someone comes up with a better solution -->
@@ -110,4 +110,8 @@
</dependency>
</dependencies>
+
+ <scm>
+ <tag>isis-viewer-wicket-1.7.0-RC1</tag>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/e8ce620b/component/viewer/wicket/ui/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/pom.xml b/component/viewer/wicket/ui/pom.xml
index f783d98..57c1c83 100644
--- a/component/viewer/wicket/ui/pom.xml
+++ b/component/viewer/wicket/ui/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
</parent>
<artifactId>isis-viewer-wicket-ui</artifactId>
[12/24] git commit: ISIS-872: updates to todoapp prior to recreating
archetype
Posted by da...@apache.org.
ISIS-872: updates to todoapp prior to recreating archetype
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/66e02d87
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/66e02d87
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/66e02d87
Branch: refs/heads/master
Commit: 66e02d87cfe856f66ec94a61b8bc0e74929cae91
Parents: 8ad38ef
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Oct 13 23:44:26 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Oct 13 23:44:26 2014 +0100
----------------------------------------------------------------------
.../todoapp/dom/src/main/java/dom/todo/ToDoItem.java | 9 +--------
example/application/todoapp/pom.xml | 7 ++++---
2 files changed, 5 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/66e02d87/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java
----------------------------------------------------------------------
diff --git a/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java b/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java
index 88e58e8..501a989 100644
--- a/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java
+++ b/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java
@@ -92,8 +92,6 @@ import org.apache.isis.applib.value.Clob;
+ "description.indexOf(:description) >= 0")
})
@ObjectType("TODO")
-@Audited
-@PublishedObject(ToDoItemChangedPayloadFactory.class)
@AutoComplete(repository=ToDoItems.class, action="autoComplete") // default unless overridden by autoCompleteNXxx() method
//@Bounded - if there were a small number of instances only (overrides autoComplete functionality)
@Bookmarkable
@@ -292,8 +290,6 @@ public class ToDoItem implements Categorized, Comparable<ToDoItem> {
}
@ActionInteraction(CompletedEvent.class)
- @Command
- @PublishedAction
@Bulk
public ToDoItem completed() {
setComplete(true);
@@ -320,8 +316,6 @@ public class ToDoItem implements Categorized, Comparable<ToDoItem> {
}
@ActionInteraction(NoLongerCompletedEvent.class)
- @Command
- @PublishedAction
@Bulk
public ToDoItem notYetCompleted() {
setComplete(false);
@@ -493,7 +487,6 @@ public class ToDoItem implements Categorized, Comparable<ToDoItem> {
getDependencies().remove(toDoItem);
}
- @PublishedAction
public ToDoItem add(
@TypicalLength(20)
final ToDoItem toDoItem) {
@@ -625,7 +618,7 @@ public class ToDoItem implements Categorized, Comparable<ToDoItem> {
@Prototype
@ActionSemantics(Of.SAFE)
public URL openSourceCodeOnGithub() throws MalformedURLException {
- return new URL("https://github.com/apache/isis/tree/master/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java");
+ return new URL("https://github.com/apache/isis/tree/master/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java");
}
//endregion
http://git-wip-us.apache.org/repos/asf/isis/blob/66e02d87/example/application/todoapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/todoapp/pom.xml b/example/application/todoapp/pom.xml
index 5baf393..71d4579 100644
--- a/example/application/todoapp/pom.xml
+++ b/example/application/todoapp/pom.xml
@@ -34,8 +34,8 @@
</prerequisites>
<properties>
- <isis.version>1.7.0-SNAPSHOT</isis.version>
- <isis-viewer-wicket.version>1.7.0-SNAPSHOT</isis-viewer-wicket.version>
+ <isis.version>1.7.0</isis.version>
+ <isis-viewer-wicket.version>1.7.0</isis-viewer-wicket.version>
<!-- must be consistent with the versions defined by the JDO Objectstore -->
<datanucleus-accessplatform-jdo-rdbms.version>3.3.6</datanucleus-accessplatform-jdo-rdbms.version>
@@ -205,7 +205,8 @@
<exclude>**/*.project</exclude>
<exclude>**/.classpath</exclude>
<exclude>**/.settings/**</exclude>
- <exclude>**/*.launch</exclude>
+ <exclude>**/ide/eclipse/launch/**</exclude>
+ <exclude>**/ide/intellij/launch/**</exclude>
<exclude>src/site/resources/ide/eclipse/**</exclude>
<exclude>**/rebel.xml</exclude>
[21/24] git commit: [maven-release-plugin] prepare for next
development iteration
Posted by da...@apache.org.
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/c7b2ee8d
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/c7b2ee8d
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/c7b2ee8d
Branch: refs/heads/master
Commit: c7b2ee8db7c6e625bfe426b98ebd2e1bf279b9f4
Parents: dadf9d4
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Oct 15 06:45:20 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Oct 15 06:45:20 2014 +0100
----------------------------------------------------------------------
core/applib/pom.xml | 2 +-
core/bytecode-cglib/pom.xml | 2 +-
core/bytecode-javassist/pom.xml | 4 +-
core/integtestsupport/pom.xml | 2 +-
core/log4j/pom.xml | 2 +-
core/metamodel/pom.xml | 2 +-
core/objectstore-inmemory/pom.xml | 2 +-
core/objectstore-jdo-datanucleus/pom.xml | 2 +-
core/objectstore-jdo-metamodel/pom.xml | 2 +-
core/pom.xml | 70 +++++++++++------------
core/runtime/pom.xml | 2 +-
core/security-noop/pom.xml | 2 +-
core/security-shiro/pom.xml | 6 +-
core/specsupport/pom.xml | 2 +-
core/tck/pom.xml | 2 +-
core/tck/tck-dom/pom.xml | 2 +-
core/tck/tck-fixture/pom.xml | 2 +-
core/tck/tck-viewer-restfulobjects/pom.xml | 2 +-
core/unittestsupport/pom.xml | 2 +-
core/viewer-restfulobjects-applib/pom.xml | 2 +-
core/viewer-restfulobjects-rendering/pom.xml | 2 +-
core/viewer-restfulobjects-server/pom.xml | 2 +-
core/webserver/pom.xml | 2 +-
core/wrapper/pom.xml | 2 +-
24 files changed, 61 insertions(+), 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/c7b2ee8d/core/applib/pom.xml
----------------------------------------------------------------------
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index d1ef3be..f3f85d2 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-applib</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/c7b2ee8d/core/bytecode-cglib/pom.xml
----------------------------------------------------------------------
diff --git a/core/bytecode-cglib/pom.xml b/core/bytecode-cglib/pom.xml
index 4f8decf..c3b7dee 100644
--- a/core/bytecode-cglib/pom.xml
+++ b/core/bytecode-cglib/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-bytecode-cglib</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/c7b2ee8d/core/bytecode-javassist/pom.xml
----------------------------------------------------------------------
diff --git a/core/bytecode-javassist/pom.xml b/core/bytecode-javassist/pom.xml
index 70ba81d..bde09da 100644
--- a/core/bytecode-javassist/pom.xml
+++ b/core/bytecode-javassist/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-bytecode-javassist</artifactId>
@@ -39,7 +39,7 @@
<connection>scm:svn:http://svn.apache.org/repos/asf/incubator/isis/trunk/runtimes/dflt/bytecode/javassist/</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/isis/trunk$/{relativeUrl}</developerConnection>
<url>http://svn.apache.org/repos/asf/incubator/isis/trunk/runtimes/dflt/bytecode/javassist/</url>
- <tag>isis-1.7.0-RC2</tag>
+ <tag>HEAD</tag>
</scm>
<!-- used in Site generation for relative references. -->
http://git-wip-us.apache.org/repos/asf/isis/blob/c7b2ee8d/core/integtestsupport/pom.xml
----------------------------------------------------------------------
diff --git a/core/integtestsupport/pom.xml b/core/integtestsupport/pom.xml
index 8ac9730..63dc02a 100644
--- a/core/integtestsupport/pom.xml
+++ b/core/integtestsupport/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-integtestsupport</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/c7b2ee8d/core/log4j/pom.xml
----------------------------------------------------------------------
diff --git a/core/log4j/pom.xml b/core/log4j/pom.xml
index ee0bbab..c6d171b 100644
--- a/core/log4j/pom.xml
+++ b/core/log4j/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-log4j</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/c7b2ee8d/core/metamodel/pom.xml
----------------------------------------------------------------------
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index ff0a8c1..40c23ed 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-metamodel</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/c7b2ee8d/core/objectstore-inmemory/pom.xml
----------------------------------------------------------------------
diff --git a/core/objectstore-inmemory/pom.xml b/core/objectstore-inmemory/pom.xml
index 319c66c..6a59929 100644
--- a/core/objectstore-inmemory/pom.xml
+++ b/core/objectstore-inmemory/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-objectstore</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/c7b2ee8d/core/objectstore-jdo-datanucleus/pom.xml
----------------------------------------------------------------------
diff --git a/core/objectstore-jdo-datanucleus/pom.xml b/core/objectstore-jdo-datanucleus/pom.xml
index eff072c..bc39760 100644
--- a/core/objectstore-jdo-datanucleus/pom.xml
+++ b/core/objectstore-jdo-datanucleus/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-objectstore-jdo-datanucleus</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/c7b2ee8d/core/objectstore-jdo-metamodel/pom.xml
----------------------------------------------------------------------
diff --git a/core/objectstore-jdo-metamodel/pom.xml b/core/objectstore-jdo-metamodel/pom.xml
index 61cc301..f3471e8 100644
--- a/core/objectstore-jdo-metamodel/pom.xml
+++ b/core/objectstore-jdo-metamodel/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-objectstore-jdo-metamodel</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/c7b2ee8d/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index afd286b..05cd0ea 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -153,7 +153,7 @@
<connection>scm:git:http://git.apache.org/isis.git/core</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/isis.git/trunk/framework/</developerConnection>
<url>git://git.apache.org/isis.git/core</url>
- <tag>isis-1.7.0-RC2</tag>
+ <tag>HEAD</tag>
</scm>
<!-- used in Site generation for relative references. -->
@@ -1031,13 +1031,13 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
<!-- not scope=test, because referenced by some sql-tests-common under compile scope -->
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1046,14 +1046,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1062,7 +1062,7 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-log4j</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -1071,14 +1071,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1087,52 +1087,52 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-wrapper</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</dependency>
<!-- bytecode components -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-bytecode-cglib</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-bytecode-javassist</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</dependency>
<!-- webserver -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-webserver</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</dependency>
<!-- specsupport -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-specsupport</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</dependency>
<!-- integtestsupport -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-integtestsupport</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
<!-- not scope=test, because referenced by some sql-tests-common under compile scope -->
</dependency>
@@ -1140,36 +1140,36 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-objectstore</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-objectstore</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-objectstore-jdo-metamodel</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-objectstore-jdo-metamodel</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-objectstore-jdo-datanucleus</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-objectstore-jdo-datanucleus</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
@@ -1179,36 +1179,36 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1218,12 +1218,12 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</dependency>
@@ -1231,22 +1231,22 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck-dom</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck-fixture</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck-viewer-restfulobjects</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/c7b2ee8d/core/runtime/pom.xml
----------------------------------------------------------------------
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index b3f3566..cf8ff65 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-runtime</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/c7b2ee8d/core/security-noop/pom.xml
----------------------------------------------------------------------
diff --git a/core/security-noop/pom.xml b/core/security-noop/pom.xml
index 27330d6..0db0b35 100644
--- a/core/security-noop/pom.xml
+++ b/core/security-noop/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-security</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/c7b2ee8d/core/security-shiro/pom.xml
----------------------------------------------------------------------
diff --git a/core/security-shiro/pom.xml b/core/security-shiro/pom.xml
index 8773f4e..0f7bab5 100644
--- a/core/security-shiro/pom.xml
+++ b/core/security-shiro/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
<name>Isis Core Shiro Security</name>
@@ -102,7 +102,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/isis/blob/c7b2ee8d/core/specsupport/pom.xml
----------------------------------------------------------------------
diff --git a/core/specsupport/pom.xml b/core/specsupport/pom.xml
index 734562f..3507691 100644
--- a/core/specsupport/pom.xml
+++ b/core/specsupport/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-specsupport</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/c7b2ee8d/core/tck/pom.xml
----------------------------------------------------------------------
diff --git a/core/tck/pom.xml b/core/tck/pom.xml
index 7ff657b..52cc6e1 100644
--- a/core/tck/pom.xml
+++ b/core/tck/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-tck</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/c7b2ee8d/core/tck/tck-dom/pom.xml
----------------------------------------------------------------------
diff --git a/core/tck/tck-dom/pom.xml b/core/tck/tck-dom/pom.xml
index 9404cfd..e4a0333 100644
--- a/core/tck/tck-dom/pom.xml
+++ b/core/tck/tck-dom/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-tck-dom</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/c7b2ee8d/core/tck/tck-fixture/pom.xml
----------------------------------------------------------------------
diff --git a/core/tck/tck-fixture/pom.xml b/core/tck/tck-fixture/pom.xml
index 197f2bd..01cf5ad 100644
--- a/core/tck/tck-fixture/pom.xml
+++ b/core/tck/tck-fixture/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-tck-fixture</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/c7b2ee8d/core/tck/tck-viewer-restfulobjects/pom.xml
----------------------------------------------------------------------
diff --git a/core/tck/tck-viewer-restfulobjects/pom.xml b/core/tck/tck-viewer-restfulobjects/pom.xml
index 878995a..489f612 100644
--- a/core/tck/tck-viewer-restfulobjects/pom.xml
+++ b/core/tck/tck-viewer-restfulobjects/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-tck-viewer-restfulobjects</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/c7b2ee8d/core/unittestsupport/pom.xml
----------------------------------------------------------------------
diff --git a/core/unittestsupport/pom.xml b/core/unittestsupport/pom.xml
index b37f0bd..ba02267 100644
--- a/core/unittestsupport/pom.xml
+++ b/core/unittestsupport/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-unittestsupport</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/c7b2ee8d/core/viewer-restfulobjects-applib/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/pom.xml b/core/viewer-restfulobjects-applib/pom.xml
index 6aaa7d8..2915072 100644
--- a/core/viewer-restfulobjects-applib/pom.xml
+++ b/core/viewer-restfulobjects-applib/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/c7b2ee8d/core/viewer-restfulobjects-rendering/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/pom.xml b/core/viewer-restfulobjects-rendering/pom.xml
index e4c8e31..586fe28 100644
--- a/core/viewer-restfulobjects-rendering/pom.xml
+++ b/core/viewer-restfulobjects-rendering/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/c7b2ee8d/core/viewer-restfulobjects-server/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/pom.xml b/core/viewer-restfulobjects-server/pom.xml
index 8d51e89..0c84024 100644
--- a/core/viewer-restfulobjects-server/pom.xml
+++ b/core/viewer-restfulobjects-server/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/c7b2ee8d/core/webserver/pom.xml
----------------------------------------------------------------------
diff --git a/core/webserver/pom.xml b/core/webserver/pom.xml
index a080080..5948a98 100644
--- a/core/webserver/pom.xml
+++ b/core/webserver/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-webserver</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/c7b2ee8d/core/wrapper/pom.xml
----------------------------------------------------------------------
diff --git a/core/wrapper/pom.xml b/core/wrapper/pom.xml
index 0752eff..0ae07e8 100644
--- a/core/wrapper/pom.xml
+++ b/core/wrapper/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-wrapper</artifactId>
[02/24] git commit: ISIS-872: update pom.xml ref latest Apache parent;
missing license headers
Posted by da...@apache.org.
ISIS-872: update pom.xml ref latest Apache parent; missing license headers
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/a6df3da8
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/a6df3da8
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/a6df3da8
Branch: refs/heads/master
Commit: a6df3da8c593772ca1603bfef002e7e9ca41646a
Parents: 6db40c5
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Oct 13 19:59:57 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Oct 13 19:59:57 2014 +0100
----------------------------------------------------------------------
.../command/Command2ContractTestAbstract.java | 18 ++++++++++++++++++
.../services/command/CommandDefaultTest.java | 18 ++++++++++++++++++
.../ExceptionRecognizerCompositeTest.java | 1 -
core/pom.xml | 1 +
4 files changed, 37 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/a6df3da8/core/applib/src/test/java/org/apache/isis/applib/services/command/Command2ContractTestAbstract.java
----------------------------------------------------------------------
diff --git a/core/applib/src/test/java/org/apache/isis/applib/services/command/Command2ContractTestAbstract.java b/core/applib/src/test/java/org/apache/isis/applib/services/command/Command2ContractTestAbstract.java
index 8d4aae6..83948ab 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/services/command/Command2ContractTestAbstract.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/services/command/Command2ContractTestAbstract.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.applib.services.command;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/isis/blob/a6df3da8/core/applib/src/test/java/org/apache/isis/applib/services/command/CommandDefaultTest.java
----------------------------------------------------------------------
diff --git a/core/applib/src/test/java/org/apache/isis/applib/services/command/CommandDefaultTest.java b/core/applib/src/test/java/org/apache/isis/applib/services/command/CommandDefaultTest.java
index 7a9e185..f890dae 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/services/command/CommandDefaultTest.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/services/command/CommandDefaultTest.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.applib.services.command;
public class CommandDefaultTest extends Command2ContractTestAbstract {
http://git-wip-us.apache.org/repos/asf/isis/blob/a6df3da8/core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerCompositeTest.java
----------------------------------------------------------------------
diff --git a/core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerCompositeTest.java b/core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerCompositeTest.java
index 47a5341..f47ba60 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerCompositeTest.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerCompositeTest.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.isis.applib.services.exceprecog;
import static org.hamcrest.CoreMatchers.is;
http://git-wip-us.apache.org/repos/asf/isis/blob/a6df3da8/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 509a7bb..b80e12c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -435,6 +435,7 @@
<exclude>**/xml/objects/**</exclude>
<exclude>**/test.data</exclude>
+ <exclude>**/fixture-data/**</exclude>
<exclude>**/src/main/appended-resources/supplemental-models.xml</exclude>
<exclude>**/datanucleus.log</exclude>
[17/24] git commit: [maven-release-plugin] prepare release
todoapp-archetype-1.7.0-RC1
Posted by da...@apache.org.
[maven-release-plugin] prepare release todoapp-archetype-1.7.0-RC1
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e0b48c71
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e0b48c71
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e0b48c71
Branch: refs/heads/master
Commit: e0b48c71bff15595db625316af98baa7f57d7b1c
Parents: f509da0
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Oct 13 23:48:58 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Oct 13 23:48:58 2014 +0100
----------------------------------------------------------------------
example/archetype/todoapp/pom.xml | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/e0b48c71/example/archetype/todoapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/todoapp/pom.xml b/example/archetype/todoapp/pom.xml
index cddfb32..c9539f8 100644
--- a/example/archetype/todoapp/pom.xml
+++ b/example/archetype/todoapp/pom.xml
@@ -17,11 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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.archetype</groupId>
<artifactId>todoapp-archetype</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.7.0</version>
<packaging>maven-archetype</packaging>
<name>todoapp-archetype</name>
<build>
@@ -47,4 +47,8 @@
<version>1.7.0</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
+
+ <scm>
+ <tag>todoapp-archetype-1.7.0-RC1</tag>
+ </scm>
</project>