Skip to content
This repository was archived by the owner on Jan 28, 2021. It is now read-only.

Commit f99e1d2

Browse files
committed
#87 - note, moves packages
1 parent 4f1027c commit f99e1d2

32 files changed

+117
-107
lines changed

modules/examples/note/demo/src/main/java/org/incode/domainapp/extended/module/fixtures/shared/FixturesModuleSharedSubmodule.java

-9
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package org.incode.examples.note.demo.shared;
2+
3+
import java.util.Set;
4+
5+
import javax.xml.bind.annotation.XmlRootElement;
6+
7+
import com.google.common.collect.Sets;
8+
9+
import org.apache.isis.applib.Module;
10+
import org.apache.isis.applib.ModuleAbstract;
11+
12+
import org.incode.examples.note.demo.shared.demo.NoteDemoSharedDemoSubmodule;
13+
14+
@XmlRootElement(name = "module")
15+
public class NoteDemoSharedModule extends ModuleAbstract {
16+
@Override public Set<Module> getDependencies() {
17+
return Sets.newHashSet(new NoteDemoSharedDemoSubmodule());
18+
}
19+
}
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
package org.incode.domainapp.extended.module.fixtures.shared.demo;
1+
package org.incode.examples.note.demo.shared.demo;
22

33
import javax.xml.bind.annotation.XmlRootElement;
44

55
import org.apache.isis.applib.ModuleAbstract;
66
import org.apache.isis.applib.fixturescripts.FixtureScript;
77

8-
import org.incode.domainapp.extended.module.fixtures.shared.demo.fixture.DemoObject_tearDown;
8+
import org.incode.examples.note.demo.shared.demo.fixture.DemoObject_tearDown;
99

1010
@XmlRootElement(name = "module")
11-
public class FixturesModuleSharedDemoSubmodule extends ModuleAbstract {
11+
public class NoteDemoSharedDemoSubmodule extends ModuleAbstract {
1212

1313
@Override public FixtureScript getTeardownFixture() {
1414
return new DemoObject_tearDown();
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.incode.domainapp.extended.module.fixtures.shared.demo.dom;
1+
package org.incode.examples.note.demo.shared.demo.dom;
22

33
import javax.jdo.annotations.IdGeneratorStrategy;
44
import javax.jdo.annotations.IdentityType;
@@ -22,15 +22,15 @@
2222

2323
@javax.jdo.annotations.PersistenceCapable(
2424
identityType=IdentityType.DATASTORE,
25-
schema="exampleDemo"
25+
schema="noteDemoShared"
2626
)
2727
@javax.jdo.annotations.DatastoreIdentity(strategy= IdGeneratorStrategy.IDENTITY, column = "id")
2828
@javax.jdo.annotations.Version(strategy=VersionStrategy.VERSION_NUMBER, column = "version")
2929
@javax.jdo.annotations.Queries({
3030
@javax.jdo.annotations.Query(
3131
name = "findByName", language = "JDOQL",
3232
value = "SELECT "
33-
+ "FROM org.incode.example.alias.demo.shared.dom.DemoObject "
33+
+ "FROM org.incode.examples.note.demo.shared.demo.dom.DemoObject "
3434
+ "WHERE name.indexOf(:name) >= 0 ")
3535
})
3636

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.incode.domainapp.extended.module.fixtures.shared.demo.dom;
1+
package org.incode.examples.note.demo.shared.demo.dom;
22

33
import java.util.List;
44

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.incode.domainapp.extended.module.fixtures.shared.demo.dom;
1+
package org.incode.examples.note.demo.shared.demo.dom;
22

33
import java.util.List;
44

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package org.incode.domainapp.extended.module.fixtures.shared.demo.fixture;
1+
package org.incode.examples.note.demo.shared.demo.fixture;
22

33
import org.apache.isis.applib.annotation.Programmatic;
44
import org.apache.isis.applib.services.registry.ServiceRegistry2;
55

6-
import org.incode.domainapp.extended.module.fixtures.shared.demo.dom.DemoObject;
6+
import org.incode.examples.note.demo.shared.demo.dom.DemoObject;
77
import org.incode.module.fixturesupport.dom.data.DemoData;
88
import org.incode.module.fixturesupport.dom.data.DemoDataPersistAbstract;
99

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package org.incode.domainapp.extended.module.fixtures.shared.demo.fixture;
1+
package org.incode.examples.note.demo.shared.demo.fixture;
22

33
import org.apache.isis.applib.fixturescripts.FixtureScript;
44

5-
import org.incode.domainapp.extended.module.fixtures.shared.demo.dom.DemoObject;
6-
import org.incode.domainapp.extended.module.fixtures.shared.demo.dom.DemoObjectMenu;
5+
import org.incode.examples.note.demo.shared.demo.dom.DemoObject;
6+
import org.incode.examples.note.demo.shared.demo.dom.DemoObjectMenu;
77

88
import lombok.Getter;
99
import lombok.Setter;
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.incode.domainapp.extended.module.fixtures.shared.demo.fixture;
1+
package org.incode.examples.note.demo.shared.demo.fixture;
22

33
import java.util.Arrays;
44
import java.util.Collections;
@@ -8,7 +8,7 @@
88

99
import org.apache.isis.applib.fixturescripts.FixtureScript;
1010

11-
import org.incode.domainapp.extended.module.fixtures.shared.demo.dom.DemoObject;
11+
import org.incode.examples.note.demo.shared.demo.dom.DemoObject;
1212

1313
import lombok.Getter;
1414
import lombok.Setter;
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package org.incode.domainapp.extended.module.fixtures.shared.demo.fixture;
1+
package org.incode.examples.note.demo.shared.demo.fixture;
22

33
import org.apache.isis.applib.fixturescripts.teardown.TeardownFixtureAbstract2;
44

5-
import org.incode.domainapp.extended.module.fixtures.shared.demo.dom.DemoObject;
5+
import org.incode.examples.note.demo.shared.demo.dom.DemoObject;
66

77
public class DemoObject_tearDown extends TeardownFixtureAbstract2 {
88

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.incode.domainapp.extended.module.fixtures.per_cpt.examples.note;
1+
package org.incode.examples.note.demo.usage;
22

33
import java.util.Set;
44

@@ -11,18 +11,18 @@
1111
import org.apache.isis.applib.fixturescripts.FixtureScript;
1212
import org.apache.isis.applib.fixturescripts.teardown.TeardownFixtureAbstract2;
1313

14-
import org.incode.domainapp.extended.module.fixtures.per_cpt.examples.note.dom.demolink.NotableLinkForDemoObject;
15-
import org.incode.domainapp.extended.module.fixtures.shared.demo.FixturesModuleSharedDemoSubmodule;
1614
import org.incode.example.note.NoteModule;
15+
import org.incode.examples.note.demo.shared.NoteDemoSharedModule;
16+
import org.incode.examples.note.demo.usage.dom.demolink.NotableLinkForDemoObject;
1717

1818
@XmlRootElement(name = "module")
19-
public class FixturesModuleExamplesNoteIntegrationSubmodule extends ModuleAbstract {
19+
public class NoteDemoUsageModule extends ModuleAbstract {
2020

2121
@Override
2222
public Set<Module> getDependencies() {
2323
return Sets.newHashSet(
2424
new NoteModule(),
25-
new FixturesModuleSharedDemoSubmodule()
25+
new NoteDemoSharedModule()
2626
);
2727
}
2828

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
package org.incode.domainapp.extended.module.fixtures.per_cpt.examples.note.dom.demolink;
1+
package org.incode.examples.note.demo.usage.dom.demolink;
22

33
import javax.jdo.annotations.Column;
44
import javax.jdo.annotations.IdentityType;
55
import javax.jdo.annotations.InheritanceStrategy;
66

77
import org.apache.isis.applib.annotation.DomainObject;
88

9-
import org.incode.domainapp.extended.module.fixtures.shared.demo.dom.DemoObject;
9+
import org.incode.examples.note.demo.shared.demo.dom.DemoObject;
1010
import org.incode.example.note.dom.impl.notablelink.NotableLink;
1111

1212
import lombok.Getter;
1313
import lombok.Setter;
1414

1515
@javax.jdo.annotations.PersistenceCapable(
1616
identityType= IdentityType.DATASTORE,
17-
schema ="exampleDomNote"
17+
schema ="noteDemoUsage"
1818
)
1919
@javax.jdo.annotations.Inheritance(strategy = InheritanceStrategy.NEW_TABLE)
2020
@DomainObject()
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package org.incode.domainapp.extended.module.fixtures.per_cpt.examples.note.dom.demolink;
1+
package org.incode.examples.note.demo.usage.dom.demolink;
22

33
import org.apache.isis.applib.annotation.DomainService;
44
import org.apache.isis.applib.annotation.NatureOfService;
55

6-
import org.incode.domainapp.extended.module.fixtures.shared.demo.dom.DemoObject;
6+
import org.incode.examples.note.demo.shared.demo.dom.DemoObject;
77
import org.incode.example.note.dom.impl.notablelink.NotableLinkRepository;
88

99
@DomainService(nature = NatureOfService.DOMAIN)
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package org.incode.domainapp.extended.module.fixtures.per_cpt.examples.note.dom.demolink;
1+
package org.incode.examples.note.demo.usage.dom.demolink;
22

33
import org.apache.isis.applib.annotation.Mixin;
44

5-
import org.incode.domainapp.extended.module.fixtures.shared.demo.dom.DemoObject;
5+
import org.incode.examples.note.demo.shared.demo.dom.DemoObject;
66
import org.incode.example.note.dom.impl.note.T_addNote;
77

88
@Mixin
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package org.incode.domainapp.extended.module.fixtures.per_cpt.examples.note.dom.demolink;
1+
package org.incode.examples.note.demo.usage.dom.demolink;
22

33
import org.apache.isis.applib.annotation.Mixin;
44

5-
import org.incode.domainapp.extended.module.fixtures.shared.demo.dom.DemoObject;
5+
import org.incode.examples.note.demo.shared.demo.dom.DemoObject;
66
import org.incode.example.note.dom.impl.note.T_notes;
77

88
@Mixin
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package org.incode.domainapp.extended.module.fixtures.per_cpt.examples.note.dom.demolink;
1+
package org.incode.examples.note.demo.usage.dom.demolink;
22

33
import org.apache.isis.applib.annotation.Mixin;
44

5-
import org.incode.domainapp.extended.module.fixtures.shared.demo.dom.DemoObject;
5+
import org.incode.examples.note.demo.shared.demo.dom.DemoObject;
66
import org.incode.example.note.dom.impl.note.T_removeNote;
77

88
@Mixin
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.incode.domainapp.extended.module.fixtures.per_cpt.examples.note.dom.spiimpl;
1+
package org.incode.examples.note.demo.usage.dom.spiimpl;
22

33
import java.util.Collection;
44
import java.util.List;
@@ -11,7 +11,7 @@
1111
import org.apache.isis.applib.annotation.NatureOfService;
1212
import org.apache.isis.applib.annotation.Programmatic;
1313

14-
import org.incode.domainapp.extended.module.fixtures.shared.demo.dom.DemoObject;
14+
import org.incode.examples.note.demo.shared.demo.dom.DemoObject;
1515
import org.incode.example.note.dom.spi.CalendarNameRepository;
1616

1717
@DomainService(
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package org.incode.domainapp.extended.module.fixtures.per_cpt.examples.note.fixture;
1+
package org.incode.examples.note.demo.usage.fixture;
22

33
import org.apache.isis.applib.fixturescripts.teardown.TeardownFixtureAbstract2;
44
import org.apache.isis.applib.services.jdosupport.IsisJdoSupport;
55

6-
import org.incode.domainapp.extended.module.fixtures.per_cpt.examples.note.dom.demolink.NotableLinkForDemoObject;
7-
import org.incode.domainapp.extended.module.fixtures.shared.demo.fixture.DemoObject_tearDown;
6+
import org.incode.examples.note.demo.usage.dom.demolink.NotableLinkForDemoObject;
7+
import org.incode.examples.note.demo.shared.demo.fixture.DemoObject_tearDown;
88
import org.incode.example.note.dom.impl.notablelink.NotableLink;
99
import org.incode.example.note.dom.impl.note.Note;
1010

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
package org.incode.domainapp.extended.module.fixtures.per_cpt.examples.note.fixture;
1+
package org.incode.examples.note.demo.usage.fixture;
22

33
import org.joda.time.LocalDate;
44

55
import org.apache.isis.applib.fixturescripts.FixtureScript;
66
import org.apache.isis.applib.services.clock.ClockService;
77

8-
import org.incode.domainapp.extended.module.fixtures.per_cpt.examples.note.dom.demolink.NotableLinkForDemoObject_addNote;
9-
import org.incode.domainapp.extended.module.fixtures.shared.demo.dom.DemoObject;
10-
import org.incode.domainapp.extended.module.fixtures.shared.demo.dom.DemoObjectMenu;
8+
import org.incode.examples.note.demo.usage.dom.demolink.NotableLinkForDemoObject_addNote;
9+
import org.incode.examples.note.demo.shared.demo.dom.DemoObject;
10+
import org.incode.examples.note.demo.shared.demo.dom.DemoObjectMenu;
1111
import org.incode.example.note.dom.impl.note.T_addNote;
1212

1313
public class DemoObject_withNotes_create3 extends FixtureScript {
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
package org.incode.domainapp.extended.integtests.examples.note;
19+
package org.incode.example.note.integtests;
2020

2121
import javax.inject.Inject;
2222

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.incode.domainapp.extended.integtests.examples.note;
1+
package org.incode.example.note.integtests;
22

33
import java.util.List;
44

@@ -11,10 +11,10 @@
1111

1212
import org.isisaddons.module.fakedata.dom.FakeDataService;
1313

14-
import org.incode.domainapp.extended.module.fixtures.per_cpt.examples.note.dom.demolink.NotableLinkForDemoObject_addNote;
15-
import org.incode.domainapp.extended.module.fixtures.per_cpt.examples.note.dom.demolink.NotableLinkForDemoObject_notes;
16-
import org.incode.domainapp.extended.module.fixtures.per_cpt.examples.note.dom.demolink.NotableLinkForDemoObject_removeNote;
17-
import org.incode.domainapp.extended.module.fixtures.shared.demo.dom.DemoObject;
14+
import org.incode.examples.note.demo.usage.dom.demolink.NotableLinkForDemoObject_addNote;
15+
import org.incode.examples.note.demo.usage.dom.demolink.NotableLinkForDemoObject_notes;
16+
import org.incode.examples.note.demo.usage.dom.demolink.NotableLinkForDemoObject_removeNote;
17+
import org.incode.examples.note.demo.shared.demo.dom.DemoObject;
1818
import org.incode.example.note.dom.impl.note.Note;
1919
import org.incode.example.note.dom.impl.note.Note_changeDate;
2020
import org.incode.example.note.dom.impl.note.Note_changeNotes;
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.incode.domainapp.extended.integtests.examples.note;
1+
package org.incode.example.note.integtests;
22

33
import java.util.Set;
44

@@ -11,14 +11,14 @@
1111

1212
import org.isisaddons.module.fakedata.FakeDataModule;
1313

14-
import org.incode.domainapp.extended.module.fixtures.per_cpt.examples.note.FixturesModuleExamplesNoteIntegrationSubmodule;
14+
import org.incode.examples.note.demo.usage.NoteDemoUsageModule;
1515

1616
@XmlRootElement(name = "module")
1717
public class NoteModuleIntegTestModule extends ModuleAbstract {
1818
@Override
1919
public Set<Module> getDependencies() {
2020
return Sets.newHashSet(
21-
new FixturesModuleExamplesNoteIntegrationSubmodule(),
21+
new NoteDemoUsageModule(),
2222
new FakeDataModule()
2323
);
2424
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.incode.domainapp.extended.integtests.examples.note.tests.demo;
1+
package org.incode.example.note.integtests.tests.demo;
22

33
import java.util.List;
44

@@ -8,10 +8,10 @@
88
import org.junit.Before;
99
import org.junit.Test;
1010

11-
import org.incode.domainapp.extended.integtests.examples.note.NoteModuleIntegTestAbstract;
12-
import org.incode.domainapp.extended.module.fixtures.per_cpt.examples.note.fixture.DemoObject_withNotes_create3;
13-
import org.incode.domainapp.extended.module.fixtures.shared.demo.dom.DemoObject;
14-
import org.incode.domainapp.extended.module.fixtures.shared.demo.dom.DemoObjectMenu;
11+
import org.incode.example.note.integtests.NoteModuleIntegTestAbstract;
12+
import org.incode.examples.note.demo.usage.fixture.DemoObject_withNotes_create3;
13+
import org.incode.examples.note.demo.shared.demo.dom.DemoObject;
14+
import org.incode.examples.note.demo.shared.demo.dom.DemoObjectMenu;
1515

1616
public class NoteDemoObjectMenu_IntegTest extends NoteModuleIntegTestAbstract {
1717

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.incode.domainapp.extended.integtests.examples.note.tests.note;
1+
package org.incode.example.note.integtests.tests.note;
22

33
import java.util.List;
44

@@ -10,11 +10,11 @@
1010
import org.junit.Before;
1111
import org.junit.Test;
1212

13-
import org.incode.domainapp.extended.integtests.examples.note.NoteModuleIntegTestAbstract;
14-
import org.incode.domainapp.extended.module.fixtures.per_cpt.examples.note.dom.spiimpl.CalendarNameRepositoryForDemo;
15-
import org.incode.domainapp.extended.module.fixtures.per_cpt.examples.note.fixture.DemoModule_withNotes_tearDown;
16-
import org.incode.domainapp.extended.module.fixtures.shared.demo.dom.DemoObject;
17-
import org.incode.domainapp.extended.module.fixtures.shared.demo.dom.DemoObjectMenu;
13+
import org.incode.example.note.integtests.NoteModuleIntegTestAbstract;
14+
import org.incode.examples.note.demo.usage.dom.spiimpl.CalendarNameRepositoryForDemo;
15+
import org.incode.examples.note.demo.usage.fixture.DemoModule_withNotes_tearDown;
16+
import org.incode.examples.note.demo.shared.demo.dom.DemoObject;
17+
import org.incode.examples.note.demo.shared.demo.dom.DemoObjectMenu;
1818
import org.incode.example.note.dom.impl.notablelink.NotableLink;
1919
import org.incode.example.note.dom.impl.notablelink.NotableLinkRepository;
2020
import org.incode.example.note.dom.impl.note.Note;
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.incode.domainapp.extended.integtests.examples.note.tests.note;
1+
package org.incode.example.note.integtests.tests.note;
22

33
import java.util.List;
44

@@ -15,11 +15,11 @@
1515
import org.apache.isis.applib.annotation.NatureOfService;
1616
import org.apache.isis.applib.services.wrapper.InvalidException;
1717

18-
import org.incode.domainapp.extended.integtests.examples.note.NoteModuleIntegTestAbstract;
19-
import org.incode.domainapp.extended.module.fixtures.per_cpt.examples.note.dom.spiimpl.CalendarNameRepositoryForDemo;
20-
import org.incode.domainapp.extended.module.fixtures.per_cpt.examples.note.fixture.DemoModule_withNotes_tearDown;
21-
import org.incode.domainapp.extended.module.fixtures.shared.demo.dom.DemoObject;
22-
import org.incode.domainapp.extended.module.fixtures.shared.demo.dom.DemoObjectMenu;
18+
import org.incode.example.note.integtests.NoteModuleIntegTestAbstract;
19+
import org.incode.examples.note.demo.usage.dom.spiimpl.CalendarNameRepositoryForDemo;
20+
import org.incode.examples.note.demo.usage.fixture.DemoModule_withNotes_tearDown;
21+
import org.incode.examples.note.demo.shared.demo.dom.DemoObject;
22+
import org.incode.examples.note.demo.shared.demo.dom.DemoObjectMenu;
2323
import org.incode.example.note.dom.impl.note.Note;
2424
import org.incode.example.note.dom.impl.note.T_addNote;
2525

0 commit comments

Comments
 (0)