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 2016/11/28 11:20:39 UTC
[4/7] isis git commit: ISIS-1538: recreating simpleapp archetype
http://git-wip-us.apache.org/repos/asf/isis/blob/d05bc761/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObjectRepository_UnitTest.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObjectRepository_UnitTest.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObjectRepository_UnitTest.java
deleted file mode 100644
index 3bab9e3..0000000
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObjectRepository_UnitTest.java
+++ /dev/null
@@ -1,129 +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 domainapp.modules.simple.dom.impl;
-
-import java.util.List;
-
-import com.google.common.collect.Lists;
-
-import org.hamcrest.Description;
-import org.hamcrest.Matcher;
-import org.hamcrest.TypeSafeMatcher;
-import org.jmock.Expectations;
-import org.jmock.Sequence;
-import org.jmock.auto.Mock;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
-
-import org.apache.isis.applib.services.registry.ServiceRegistry2;
-import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class SimpleObjectRepository_UnitTest {
-
- @Rule
- public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES);
-
- @Mock
- ServiceRegistry2 mockServiceRegistry;
-
- @Mock
- RepositoryService mockRepositoryService;
-
- SimpleObjectRepository simpleObjectRepository;
-
- @Before
- public void setUp() throws Exception {
- simpleObjectRepository = new SimpleObjectRepository();
- simpleObjectRepository.repositoryService = mockRepositoryService;
- simpleObjectRepository.serviceRegistry = mockServiceRegistry;
- }
-
- public static class Create extends SimpleObjectRepository_UnitTest {
-
- @Test
- public void happyCase() throws Exception {
-
- final String someName = "Foobar";
-
- // given
- final Sequence seq = context.sequence("create");
- context.checking(new Expectations() {
- {
- oneOf(mockServiceRegistry).injectServicesInto(with(any(SimpleObject.class)));
- inSequence(seq);
-
- oneOf(mockRepositoryService).persist(with(nameOf(someName)));
- inSequence(seq);
- }
-
- });
-
- // when
- final SimpleObject obj = simpleObjectRepository.create(someName);
-
- // then
- assertThat(obj).isNotNull();
- assertThat(obj.getName()).isEqualTo(someName);
- }
-
- private static Matcher<SimpleObject> nameOf(final String name) {
- return new TypeSafeMatcher<SimpleObject>() {
- @Override
- protected boolean matchesSafely(final SimpleObject item) {
- return name.equals(item.getName());
- }
-
- @Override
- public void describeTo(final Description description) {
- description.appendText("has name of '" + name + "'");
- }
- };
- }
- }
-
- public static class ListAll extends SimpleObjectRepository_UnitTest {
-
- @Test
- public void happyCase() throws Exception {
-
- // given
- final List<SimpleObject> all = Lists.newArrayList();
-
- context.checking(new Expectations() {
- {
- oneOf(mockRepositoryService).allInstances(SimpleObject.class);
- will(returnValue(all));
- }
- });
-
- // when
- final List<SimpleObject> list = simpleObjectRepository.listAll();
-
- // then
- assertThat(list).isEqualTo(all);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/d05bc761/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObject_UnitTest.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObject_UnitTest.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObject_UnitTest.java
deleted file mode 100644
index ec2bb0e..0000000
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObject_UnitTest.java
+++ /dev/null
@@ -1,52 +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 domainapp.modules.simple.dom.impl;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class SimpleObject_UnitTest {
-
- SimpleObject simpleObject;
-
- @Before
- public void setUp() throws Exception {
- simpleObject = new SimpleObject("Foobar");
- }
-
- public static class Name extends SimpleObject_UnitTest {
-
- @Test
- public void happyCase() throws Exception {
- // given
- assertThat(simpleObject.getName()).isEqualTo("Foobar");
-
- // when
- String name = "Foobar - updated";
- simpleObject.setName(name);
-
- // then
- assertThat(simpleObject.getName()).isEqualTo(name);
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/d05bc761/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
deleted file mode 100644
index df6dd09..0000000
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
+++ /dev/null
@@ -1,84 +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 domainapp.modules.simple.integtests;
-
-import java.util.List;
-import java.util.Map;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-
-import org.junit.BeforeClass;
-
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
-import org.apache.isis.applib.fixturescripts.FixtureScripts;
-import org.apache.isis.applib.services.fixturespec.FixtureScriptsSpecification;
-import org.apache.isis.applib.services.fixturespec.FixtureScriptsSpecificationProvider;
-import org.apache.isis.core.integtestsupport.IntegrationTestAbstract;
-import org.apache.isis.core.integtestsupport.IsisSystemForTest;
-import org.apache.isis.core.integtestsupport.scenarios.ScenarioExecutionForIntegration;
-
-import domainapp.modules.simple.SimpleModuleManifest;
-
-public abstract class SimpleModuleIntegTestAbstract extends IntegrationTestAbstract {
-
- @BeforeClass
- public static void initSystem() {
- org.apache.log4j.PropertyConfigurator.configure("logging-integtest.properties");
- IsisSystemForTest isft = IsisSystemForTest.getElseNull();
- if(isft == null) {
- isft = new IsisSystemForTest.Builder()
- .withLoggingAt(org.apache.log4j.Level.INFO)
- .with(new SimpleModuleManifest() {
- @Override
- public Map<String, String> getConfigurationProperties() {
- final Map<String, String> map = Maps.newHashMap();
- Util.withJavaxJdoRunInMemoryProperties(map);
- Util.withDataNucleusProperties(map);
- Util.withIsisIntegTestProperties(map);
- return map;
- }
-
- @Override public List<Class<?>> getAdditionalServices() {
- return Lists.newArrayList(ModuleFixtureScriptsSpecificationProvider.class);
- }
- })
-
- .build();
- isft.setUpSystem();
- IsisSystemForTest.set(isft);
- }
-
- // instantiating will install onto ThreadLocal
- new ScenarioExecutionForIntegration();
- }
-
- @DomainService(nature = NatureOfService.DOMAIN)
- public static class ModuleFixtureScriptsSpecificationProvider implements FixtureScriptsSpecificationProvider {
- @Override
- public FixtureScriptsSpecification getSpecification() {
- return FixtureScriptsSpecification.builder("domainapp.modules.simple").with(
- FixtureScripts.MultipleExecutionStrategy.EXECUTE_ONCE_BY_VALUE).build();
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/d05bc761/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjectMenu_IntegTest.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjectMenu_IntegTest.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjectMenu_IntegTest.java
deleted file mode 100644
index cf76151..0000000
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjectMenu_IntegTest.java
+++ /dev/null
@@ -1,152 +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 domainapp.modules.simple.integtests.tests;
-
-import java.sql.SQLIntegrityConstraintViolationException;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import com.google.common.base.Throwables;
-
-import org.hamcrest.Description;
-import org.hamcrest.Matcher;
-import org.hamcrest.TypeSafeMatcher;
-import org.junit.Test;
-
-import org.apache.isis.applib.fixturescripts.FixtureScript;
-import org.apache.isis.applib.fixturescripts.FixtureScripts;
-import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.applib.services.xactn.TransactionService;
-
-import domainapp.modules.simple.dom.impl.SimpleObject;
-import domainapp.modules.simple.dom.impl.SimpleObjectMenu;
-import domainapp.modules.simple.fixture.scenario.RecreateSimpleObjects;
-import domainapp.modules.simple.fixture.teardown.SimpleModuleTearDown;
-import domainapp.modules.simple.integtests.SimpleModuleIntegTestAbstract;
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class SimpleObjectMenu_IntegTest extends SimpleModuleIntegTestAbstract {
-
- @Inject
- FixtureScripts fixtureScripts;
- @Inject
- TransactionService transactionService;
- @Inject
- SimpleObjectMenu menu;
- @Inject
- RepositoryService repositoryService;
-
- public static class ListAll extends SimpleObjectMenu_IntegTest {
-
- @Test
- public void happyCase() throws Exception {
-
- // given
- RecreateSimpleObjects fs = new RecreateSimpleObjects();
- fixtureScripts.runFixtureScript(fs, null);
- transactionService.nextTransaction();
-
- // when
- final List<SimpleObject> all = wrap(menu).listAll();
-
- // then
- assertThat(all).hasSize(fs.getSimpleObjects().size());
-
- SimpleObject simpleObject = wrap(all.get(0));
- assertThat(simpleObject.getName()).isEqualTo(fs.getSimpleObjects().get(0).getName());
- }
-
- @Test
- public void whenNone() throws Exception {
-
- // given
- FixtureScript fs = new SimpleModuleTearDown();
- fixtureScripts.runFixtureScript(fs, null);
- transactionService.nextTransaction();
-
- // when
- final List<SimpleObject> all = wrap(menu).listAll();
-
- // then
- assertThat(all).hasSize(0);
- }
- }
-
- public static class Create extends SimpleObjectMenu_IntegTest {
-
- @Test
- public void happyCase() throws Exception {
-
- // given
- FixtureScript fs = new SimpleModuleTearDown();
- fixtureScripts.runFixtureScript(fs, null);
- transactionService.nextTransaction();
-
- // when
- wrap(menu).create("Faz");
-
- // then
- final List<SimpleObject> all = wrap(menu).listAll();
- assertThat(all).hasSize(1);
- }
-
- @Test
- public void whenAlreadyExists() throws Exception {
-
- // given
- FixtureScript fs = new SimpleModuleTearDown();
- fixtureScripts.runFixtureScript(fs, null);
- transactionService.nextTransaction();
- wrap(menu).create("Faz");
- transactionService.nextTransaction();
-
- // then
- expectedExceptions.expectCause(causalChainContains(SQLIntegrityConstraintViolationException.class));
-
- // when
- wrap(menu).create("Faz");
- transactionService.nextTransaction();
- }
-
- private static Matcher<? extends Throwable> causalChainContains(final Class<?> cls) {
- return new TypeSafeMatcher<Throwable>() {
- @Override
- protected boolean matchesSafely(Throwable item) {
- final List<Throwable> causalChain = Throwables.getCausalChain(item);
- for (Throwable throwable : causalChain) {
- if(cls.isAssignableFrom(throwable.getClass())){
- return true;
- }
- }
- return false;
- }
-
- @Override
- public void describeTo(Description description) {
- description.appendText("exception with causal chain containing " + cls.getSimpleName());
- }
- };
- }
- }
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/d05bc761/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java
deleted file mode 100644
index f4b4cce..0000000
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java
+++ /dev/null
@@ -1,156 +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 domainapp.modules.simple.integtests.tests;
-
-import java.sql.Timestamp;
-
-import javax.inject.Inject;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import org.apache.isis.applib.fixturescripts.FixtureScripts;
-import org.apache.isis.applib.services.title.TitleService;
-import org.apache.isis.applib.services.wrapper.DisabledException;
-import org.apache.isis.applib.services.wrapper.InvalidException;
-import org.apache.isis.applib.services.xactn.TransactionService;
-import org.apache.isis.core.metamodel.services.jdosupport.Persistable_datanucleusIdLong;
-import org.apache.isis.core.metamodel.services.jdosupport.Persistable_datanucleusVersionTimestamp;
-
-import domainapp.modules.simple.dom.impl.SimpleObject;
-import domainapp.modules.simple.fixture.scenario.RecreateSimpleObjects;
-import domainapp.modules.simple.integtests.SimpleModuleIntegTestAbstract;
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class SimpleObject_IntegTest extends SimpleModuleIntegTestAbstract {
-
- @Inject
- FixtureScripts fixtureScripts;
- @Inject
- TransactionService transactionService;
-
- SimpleObject simpleObject;
-
- @Before
- public void setUp() throws Exception {
- // given
- RecreateSimpleObjects fs = new RecreateSimpleObjects().setNumber(1);
- fixtureScripts.runFixtureScript(fs, null);
- transactionService.nextTransaction();
-
- simpleObject = fs.getSimpleObjects().get(0);
-
- assertThat(simpleObject).isNotNull();
- }
-
- public static class Name extends SimpleObject_IntegTest {
-
- @Test
- public void accessible() throws Exception {
- // when
- final String name = wrap(simpleObject).getName();
-
- // then
- assertThat(name).isEqualTo(simpleObject.getName());
- }
-
- @Test
- public void not_editable() throws Exception {
- // expect
- expectedExceptions.expect(DisabledException.class);
-
- // when
- wrap(simpleObject).setName("new name");
- }
-
- }
-
- public static class UpdateName extends SimpleObject_IntegTest {
-
- @Test
- public void can_be_updated_directly() throws Exception {
-
- // when
- wrap(mixin(SimpleObject._updateName.class, simpleObject)).${symbol_dollar}${symbol_dollar}("new name");
- transactionService.nextTransaction();
-
- // then
- assertThat(wrap(simpleObject).getName()).isEqualTo("new name");
- }
-
- @Test
- public void failsValidation() throws Exception {
-
- // expect
- expectedExceptions.expect(InvalidException.class);
- expectedExceptions.expectMessage("Exclamation mark is not allowed");
-
- // when
- wrap(mixin(SimpleObject._updateName.class, simpleObject)).${symbol_dollar}${symbol_dollar}("new name!");
- }
- }
-
-
- public static class Title extends SimpleObject_IntegTest {
-
- @Inject
- TitleService titleService;
-
- @Test
- public void interpolatesName() throws Exception {
-
- // given
- final String name = wrap(simpleObject).getName();
-
- // when
- final String title = titleService.titleOf(simpleObject);
-
- // then
- assertThat(title).isEqualTo("Object: " + name);
- }
- }
-
- public static class DataNucleusId extends SimpleObject_IntegTest {
-
- @Test
- public void should_be_populated() throws Exception {
- // when
- final Long id = mixin(Persistable_datanucleusIdLong.class, simpleObject).${symbol_dollar}${symbol_dollar}();
-
- // then
- assertThat(id).isGreaterThanOrEqualTo(0);
- }
- }
-
- public static class DataNucleusVersionTimestamp extends SimpleObject_IntegTest {
-
- @Test
- public void should_be_populated() throws Exception {
- // when
- final Timestamp timestamp = mixin(Persistable_datanucleusVersionTimestamp.class, simpleObject).${symbol_dollar}${symbol_dollar}();
- // then
- assertThat(timestamp).isNotNull();
- }
- }
-
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/d05bc761/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/translations.pot
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/translations.pot b/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/translations.pot
deleted file mode 100644
index aadc192..0000000
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/translations.pot
+++ /dev/null
@@ -1,414 +0,0 @@
-
-
-##############################################################################
-#
-# .pot file
-#
-# Translate this file to each required language and place in WEB-INF, eg:
-#
-# /WEB-INF/translations-en_US.po
-# /WEB-INF/translations-en.po
-# /WEB-INF/translations-fr_FR.po
-# /WEB-INF/translations-fr.po
-# /WEB-INF/translations.po
-#
-# If the app uses TranslatableString (eg for internationalized validation
-# messages), or if the app calls the TranslationService directly, then ensure
-# that all text to be translated has been captured by running a full
-# integration test suite that exercises all relevant behaviour
-#
-##############################################################################
-
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"POT-Creation-Date: 2016-11-24 14:44:20+\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-
-
-#: org.apache.isis.applib.services.metamodel.MetaModelServicesMenu#downloadMetaModel(java.lang.String)
-msgid ".csv file name"
-msgstr ""
-
-
-#: org.apache.isis.core.metamodel.services.jdosupport.Persistable_downloadJdoMetadata#$$(java.lang.String)
-msgid ".jdo file name"
-msgstr ""
-
-
-#: org.apache.isis.core.runtime.services.i18n.po.TranslationServicePoMenu#downloadTranslations(java.lang.String)
-msgid ".pot file name"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.appfeat.ApplicationMemberType#ACTION
-msgid "Action"
-msgstr ""
-
-
-#: org.apache.isis.core.runtime.system.session.IsisSessionFactoryBuilder
-msgid "Are you sure?"
-msgstr ""
-
-
-#: org.apache.isis.core.runtime.system.session.IsisSessionFactoryBuilder
-msgid "Cancel"
-msgstr ""
-
-
-#: org.apache.isis.core.runtime.services.i18n.po.TranslationServicePoMenu#resetTranslationCache()
-msgid "Clear translation cache"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.appfeat.ApplicationMemberType#COLLECTION
-msgid "Collection"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.layout.LayoutService$Style#COMPLETE
-msgid "Complete"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.config.ConfigurationServiceMenu#configuration()
-msgid "Configuration"
-msgstr ""
-
-
-#: org.apache.isis.core.runtime.system.session.IsisSessionFactoryBuilder
-msgid "Confirm"
-msgstr ""
-
-
-#: domainapp.modules.simple.dom.impl.SimpleObjectMenu#create()
-#: domainapp.modules.simple.dom.impl.SimpleObjectRepository#create()
-msgid "Create"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.layout.LayoutService$Style#CURRENT
-msgid "Current"
-msgstr ""
-
-
-#: domainapp.modules.simple.dom.impl.SimpleObject#delete()
-msgid "Delete"
-msgstr ""
-
-
-#: domainapp.modules.simple.dom.impl.SimpleObject#downloadJdoMetadata()
-msgid "Download Jdo Metadata"
-msgstr ""
-
-
-#: domainapp.modules.simple.dom.impl.SimpleObject#downloadLayoutXml()
-msgid "Download Layout Xml"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.layout.LayoutServiceMenu#downloadLayouts()
-msgid "Download Layouts (XML)"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.metamodel.MetaModelServicesMenu#downloadMetaModel()
-msgid "Download Meta Model (CSV)"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.swagger.SwaggerServiceMenu#downloadSwaggerSpec()
-msgid "Download Swagger Spec"
-msgstr ""
-
-
-#: org.apache.isis.core.runtime.services.i18n.po.TranslationServicePoMenu#downloadTranslations()
-msgid "Download Translations"
-msgstr ""
-
-
-#: domainapp.modules.simple.dom.impl.SimpleObject$_updateName#$$(java.lang.String)
-msgid "Exclamation mark is not allowed"
-msgstr ""
-
-
-#: org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternalNoop#executeWithinTransaction()
-#: org.apache.isis.core.runtime.services.persistsession.PersistenceSessionServiceInternalDefault#executeWithinTransaction()
-msgid "Execute Within Transaction"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.dto.Dto_downloadXml#$$(java.lang.String)
-#: org.apache.isis.applib.services.dto.Dto_downloadXsd#$$(java.lang.String,org.apache.isis.applib.services.jaxb.JaxbService$IsisSchemas)
-#: org.apache.isis.applib.services.layout.Object_downloadLayoutXml#$$(java.lang.String,org.apache.isis.applib.services.layout.LayoutService$Style)
-msgid "File name"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.swagger.SwaggerServiceMenu#downloadSwaggerSpec(java.lang.String,org.apache.isis.applib.services.swagger.SwaggerService$Visibility,org.apache.isis.applib.services.swagger.SwaggerService$Format)
-msgid "Filename"
-msgstr ""
-
-
-#: domainapp.modules.simple.dom.impl.SimpleObjectMenu#findByName()
-#: domainapp.modules.simple.dom.impl.SimpleObjectRepository#findByName()
-msgid "Find By Name"
-msgstr ""
-
-
-#: org.apache.isis.applib.fixturescripts.FixtureResult#fixtureScriptClassName
-msgid "Fixture script"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.queryresultscache.QueryResultsCache$Control#fixturesInstalling
-msgid "Fixtures Installing"
-msgstr ""
-
-
-#: org.apache.isis.applib.fixturescripts.FixtureScript#friendlyName
-msgid "Friendly Name"
-msgstr ""
-
-
-#: org.apache.isis.core.metamodel.services.jdosupport.Persistable_datanucleusIdLong#$$()
-msgid "Id"
-msgstr ""
-
-
-#: org.apache.isis.applib.annotation.SemanticsOf#IDEMPOTENT
-msgid "Idempotent"
-msgstr ""
-
-
-#: org.apache.isis.applib.annotation.SemanticsOf#IDEMPOTENT_ARE_YOU_SURE
-msgid "Idempotent Are You Sure"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.jaxb.JaxbService$IsisSchemas#IGNORE
-msgid "Ignore"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.jaxb.JaxbService$IsisSchemas#INCLUDE
-msgid "Include"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.swagger.SwaggerService$Format#JSON
-msgid "Json"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.config.ConfigurationProperty#key
-msgid "Key"
-msgstr ""
-
-
-#: domainapp.modules.simple.dom.impl.SimpleObjectMenu#listAll()
-#: domainapp.modules.simple.dom.impl.SimpleObjectRepository#listAll()
-msgid "List All"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.bookmark.BookmarkHolderActionContributions#lookup()
-msgid "Lookup"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.layout.Object_downloadLayoutXml
-#: org.apache.isis.applib.services.layout.Object_rebuildMetamodel
-#: org.apache.isis.core.metamodel.services.jdosupport.Persistable_datanucleusIdLong
-#: org.apache.isis.core.metamodel.services.jdosupport.Persistable_datanucleusVersionLong
-#: org.apache.isis.core.metamodel.services.jdosupport.Persistable_datanucleusVersionTimestamp
-#: org.apache.isis.core.metamodel.services.jdosupport.Persistable_downloadJdoMetadata
-msgid "Metadata"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.layout.LayoutService$Style#MINIMAL
-msgid "Minimal"
-msgstr ""
-
-
-#: domainapp.modules.simple.dom.impl.SimpleObject#name
-#: domainapp.modules.simple.dom.impl.SimpleObject$_updateName#$$(java.lang.String)
-#: domainapp.modules.simple.dom.impl.SimpleObjectMenu#create(java.lang.String)
-#: domainapp.modules.simple.dom.impl.SimpleObjectMenu#findByName(java.lang.String)
-msgid "Name"
-msgstr ""
-
-
-#: org.apache.isis.core.metamodel.services.appfeat.ApplicationFeatureFactory#newApplicationFeature()
-msgid "New Application Feature"
-msgstr ""
-
-
-#: org.apache.isis.applib.annotation.SemanticsOf#NON_IDEMPOTENT
-msgid "Non Idempotent"
-msgstr ""
-
-
-#: org.apache.isis.applib.annotation.SemanticsOf#NON_IDEMPOTENT_ARE_YOU_SURE
-msgid "Non Idempotent Are You Sure"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.layout.LayoutService$Style#NORMALIZED
-msgid "Normalized"
-msgstr ""
-
-
-#: domainapp.modules.simple.dom.impl.SimpleObject#notes
-msgid "Notes"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.bookmark.BookmarkHolderAssociationContributions#object()
-msgid "Object"
-msgstr ""
-
-
-#: domainapp.modules.simple.dom.impl.SimpleObject#title()
-msgid "Object: {name}"
-msgstr ""
-
-
-#: org.apache.isis.applib.fixturescripts.FixtureScripts#runFixtureScript(org.apache.isis.applib.fixturescripts.FixtureScript,java.lang.String)
-#: org.apache.isis.applib.services.fixturespec.FixtureScriptsDefault#runFixtureScript(org.apache.isis.applib.fixturescripts.FixtureScript,java.lang.String)
-#: org.apache.isis.applib.services.fixturespec.FixtureScriptsDefault#runFixtureScriptWithAutoComplete(org.apache.isis.applib.fixturescripts.FixtureScript,java.lang.String)
-msgid "Parameters"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.swagger.SwaggerService$Visibility#PRIVATE
-msgid "Private"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.swagger.SwaggerService$Visibility#PRIVATE_WITH_PROTOTYPING
-msgid "Private With Prototyping"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.appfeat.ApplicationMemberType#PROPERTY
-msgid "Property"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.fixturespec.FixtureScriptsDefault
-#: org.apache.isis.applib.services.layout.LayoutServiceMenu
-#: org.apache.isis.applib.services.metamodel.MetaModelServicesMenu
-#: org.apache.isis.applib.services.swagger.SwaggerServiceMenu
-#: org.apache.isis.core.runtime.services.i18n.po.TranslationServicePoMenu
-msgid "Prototyping"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.swagger.SwaggerService$Visibility#PUBLIC
-msgid "Public"
-msgstr ""
-
-
-#: domainapp.modules.simple.dom.impl.SimpleObject#rebuildMetamodel()
-msgid "Rebuild Metamodel"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.fixturespec.FixtureScriptsDefault#recreateObjectsAndReturnFirst()
-msgid "Recreate Objects And Return First"
-msgstr ""
-
-
-#: org.apache.isis.applib.fixturescripts.FixtureResult#object
-msgid "Result"
-msgstr ""
-
-
-#: org.apache.isis.applib.fixturescripts.FixtureResult#className
-msgid "Result class"
-msgstr ""
-
-
-#: org.apache.isis.applib.fixturescripts.FixtureResult#key
-msgid "Result key"
-msgstr ""
-
-
-#: org.apache.isis.applib.fixturescripts.FixtureScripts#runFixtureScript()
-#: org.apache.isis.applib.services.fixturespec.FixtureScriptsDefault#runFixtureScript()
-#: org.apache.isis.applib.services.fixturespec.FixtureScriptsDefault#runFixtureScriptWithAutoComplete()
-msgid "Run Fixture Script"
-msgstr ""
-
-
-#: org.apache.isis.applib.annotation.SemanticsOf#SAFE
-msgid "Safe"
-msgstr ""
-
-
-#: org.apache.isis.applib.annotation.SemanticsOf#SAFE_AND_REQUEST_CACHEABLE
-msgid "Safe And Request Cacheable"
-msgstr ""
-
-
-#: org.apache.isis.applib.fixturescripts.FixtureScript
-msgid "Script"
-msgstr ""
-
-
-#: org.apache.isis.applib.fixturescripts.FixtureScripts#runFixtureScript(org.apache.isis.applib.fixturescripts.FixtureScript,java.lang.String)
-#: org.apache.isis.applib.services.fixturespec.FixtureScriptsDefault#runFixtureScript(org.apache.isis.applib.fixturescripts.FixtureScript,java.lang.String)
-#: org.apache.isis.applib.services.fixturespec.FixtureScriptsDefault#runFixtureScriptWithAutoComplete(org.apache.isis.applib.fixturescripts.FixtureScript,java.lang.String)
-msgid "Script-specific parameters (if any). The format depends on the script implementation (eg key=value, CSV, JSON, XML etc)"
-msgstr ""
-
-
-#: domainapp.modules.simple.dom.impl.SimpleObjectMenu
-msgid "Simple Objects"
-msgstr ""
-
-
-#: org.apache.isis.core.runtime.services.i18n.po.TranslationServicePoMenu#switchToReadingTranslations()
-msgid "Switch To Reading Translations"
-msgstr ""
-
-
-#: org.apache.isis.core.runtime.services.i18n.po.TranslationServicePoMenu#switchToWritingTranslations()
-msgid "Switch To Writing Translations"
-msgstr ""
-
-
-#: domainapp.modules.simple.dom.impl.SimpleObject#updateName()
-msgid "Update Name"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.config.ConfigurationProperty#value
-msgid "Value"
-msgstr ""
-
-
-#: org.apache.isis.core.metamodel.services.jdosupport.Persistable_datanucleusVersionLong#$$()
-#: org.apache.isis.core.metamodel.services.jdosupport.Persistable_datanucleusVersionTimestamp#$$()
-msgid "Version"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.swagger.SwaggerService$Format#YAML
-msgid "Yaml"
-msgstr ""
-
-
-
-
-
-##############################################################################
-# end of .pot file
-##############################################################################
-
http://git-wip-us.apache.org/repos/asf/isis/blob/d05bc761/example/archetype/simpleapp/src/main/resources/archetype-resources/pom-jdo-enhance-all.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom-jdo-enhance-all.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/pom-jdo-enhance-all.xml
index f763a6e..6c9ba36 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom-jdo-enhance-all.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/pom-jdo-enhance-all.xml
@@ -84,9 +84,9 @@
<activeByDefault>true</activeByDefault>
</activation>
<modules>
- <module>modules/module-simple</module>
+ <module>module-simple</module>
</modules>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/d05bc761/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 fa74ed8..44a4a9b 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 @@
-#Thu Nov 24 16:04:30 GMT 2016
+#Mon Nov 28 11:15:13 GMT 2016
package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it