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

Commit 9aad9f8

Browse files
danhaywooddanhaywood
committed
#87 - extended app now compiles
1 parent 8d934b3 commit 9aad9f8

File tree

496 files changed

+25254
-188
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

496 files changed

+25254
-188
lines changed

‎ex/app/extended/.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
activemq-data/*
2+
.flattened-pom.xml
3+

‎ex/app/extended/appdefn/pom.xml

+54-80
Original file line numberDiff line numberDiff line change
@@ -99,54 +99,6 @@
9999
<artifactId>incode-extended-module-simple</artifactId>
100100
</dependency>
101101

102-
<dependency>
103-
<groupId>${project.groupId}</groupId>
104-
<artifactId>incode-extended-module-simple</artifactId>
105-
<scope>test</scope>
106-
<type>test-jar</type>
107-
</dependency>
108-
109-
<dependency>
110-
<groupId>org.togglz</groupId>
111-
<artifactId>togglz-junit</artifactId>
112-
<scope>test</scope>
113-
</dependency>
114-
115-
<dependency>
116-
<groupId>org.axonframework</groupId>
117-
<artifactId>axon-core</artifactId>
118-
</dependency>
119-
120-
<dependency>
121-
<groupId>org.datanucleus</groupId>
122-
<artifactId>datanucleus-core</artifactId>
123-
<optional>true</optional>
124-
</dependency>
125-
126-
<!-- test -->
127-
<dependency>
128-
<groupId>org.apache.isis.mavendeps</groupId>
129-
<artifactId>isis-mavendeps-testing</artifactId>
130-
<type>pom</type>
131-
<scope>test</scope>
132-
</dependency>
133-
134-
<dependency>
135-
<groupId>org.apache.isis.core</groupId>
136-
<artifactId>isis-core-applib</artifactId>
137-
</dependency>
138-
139-
<dependency>
140-
<groupId>${project.groupId}</groupId>
141-
<artifactId>incode-extended-appdefn</artifactId>
142-
</dependency>
143-
144-
<dependency>
145-
<groupId>${project.groupId}</groupId>
146-
<artifactId>incode-extended-example-dom</artifactId>
147-
</dependency>
148-
149-
150102
<dependency>
151103
<groupId>org.isisaddons.module.fakedata</groupId>
152104
<artifactId>isis-module-fakedata-dom</artifactId>
@@ -157,29 +109,6 @@
157109
<artifactId>incode-module-fixturesupport-dom</artifactId>
158110
</dependency>
159111

160-
<dependency>
161-
<groupId>org.apache.isis.mavendeps</groupId>
162-
<artifactId>isis-mavendeps-testing</artifactId>
163-
<type>pom</type>
164-
<scope>test</scope>
165-
</dependency>
166-
167-
<dependency>
168-
<groupId>org.hsqldb</groupId>
169-
<artifactId>hsqldb</artifactId>
170-
</dependency>
171-
172-
<dependency>
173-
<groupId>org.axonframework</groupId>
174-
<artifactId>axon-core</artifactId>
175-
</dependency>
176-
177-
<dependency>
178-
<groupId>org.projectlombok</groupId>
179-
<artifactId>lombok</artifactId>
180-
<scope>provided</scope>
181-
</dependency>
182-
183112
<dependency>
184113
<groupId>org.isisaddons.module.togglz</groupId>
185114
<artifactId>isis-module-togglz-glue</artifactId>
@@ -194,10 +123,12 @@
194123
<groupId>org.isisaddons.module.audit</groupId>
195124
<artifactId>isis-module-audit-dom</artifactId>
196125
</dependency>
126+
197127
<dependency>
198128
<groupId>org.isisaddons.module.command</groupId>
199129
<artifactId>isis-module-command-dom</artifactId>
200130
</dependency>
131+
201132
<dependency>
202133
<groupId>org.isisaddons.module.publishmq</groupId>
203134
<artifactId>isis-module-publishmq-dom-jdo</artifactId>
@@ -206,19 +137,10 @@
206137
<groupId>org.isisaddons.module.publishmq</groupId>
207138
<artifactId>isis-module-publishmq-dom-servicespi</artifactId>
208139
</dependency>
209-
<dependency>
210-
<groupId>org.mindrot</groupId>
211-
<artifactId>jbcrypt</artifactId>
212-
<version>${jbcrypt.version}</version>
213-
</dependency>
214140
<dependency>
215141
<groupId>org.isisaddons.module.security</groupId>
216142
<artifactId>isis-module-security-dom</artifactId>
217143
</dependency>
218-
<dependency>
219-
<groupId>org.mindrot</groupId>
220-
<artifactId>jbcrypt</artifactId>
221-
</dependency>
222144
<dependency>
223145
<groupId>org.isisaddons.module.sessionlogger</groupId>
224146
<artifactId>isis-module-sessionlogger-dom</artifactId>
@@ -251,6 +173,58 @@
251173
<groupId>org.incode.example.settings</groupId>
252174
<artifactId>incode-example-settings-dom</artifactId>
253175
</dependency>
176+
177+
<dependency>
178+
<groupId>org.apache.isis.core</groupId>
179+
<artifactId>isis-core-applib</artifactId>
180+
</dependency>
181+
182+
<dependency>
183+
<groupId>org.mindrot</groupId>
184+
<artifactId>jbcrypt</artifactId>
185+
<version>${jbcrypt.version}</version>
186+
</dependency>
187+
188+
<dependency>
189+
<groupId>org.hsqldb</groupId>
190+
<artifactId>hsqldb</artifactId>
191+
</dependency>
192+
193+
<dependency>
194+
<groupId>org.axonframework</groupId>
195+
<artifactId>axon-core</artifactId>
196+
</dependency>
197+
198+
199+
<!-- optional -->
200+
<dependency>
201+
<groupId>org.datanucleus</groupId>
202+
<artifactId>datanucleus-core</artifactId>
203+
<optional>true</optional>
204+
</dependency>
205+
206+
<!-- test -->
207+
<dependency>
208+
<groupId>org.apache.isis.mavendeps</groupId>
209+
<artifactId>isis-mavendeps-testing</artifactId>
210+
<type>pom</type>
211+
<scope>test</scope>
212+
</dependency>
213+
214+
<dependency>
215+
<groupId>${project.groupId}</groupId>
216+
<artifactId>incode-extended-module-simple</artifactId>
217+
<scope>test</scope>
218+
<type>test-jar</type>
219+
</dependency>
220+
221+
<dependency>
222+
<groupId>org.togglz</groupId>
223+
<artifactId>togglz-junit</artifactId>
224+
<scope>test</scope>
225+
</dependency>
226+
227+
254228
</dependencies>
255229

256230
</project>

‎ex/app/extended/appdefn/src/main/java/org/incode/domainapp/example/app/DomainAppAppManifestWithExampleModules.java

+72
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
package org.incode.domainapp.example.app;
2+
3+
import org.apache.isis.applib.AppManifestAbstract;
4+
5+
import org.incode.example.country.dom.CountryModule;
6+
import org.isisaddons.module.docx.DocxModule;
7+
import org.isisaddons.module.excel.ExcelModule;
8+
import org.isisaddons.module.fakedata.FakeDataModule;
9+
import org.isisaddons.module.freemarker.dom.FreeMarkerModule;
10+
import org.isisaddons.module.pdfbox.dom.PdfBoxModule;
11+
import org.isisaddons.module.poly.PolyModule;
12+
import org.isisaddons.module.servletapi.ServletApiModule;
13+
import org.isisaddons.module.stringinterpolator.StringInterpolatorModule;
14+
15+
import org.incode.example.tags.TagsModule;
16+
import org.isisaddons.module.xdocreport.dom.XDocReportModule;
17+
18+
import org.incode.domainapp.example.dom.ExampleDomSubmodule;
19+
import org.incode.domainapp.example.dom.demo.ExampleDomDemoDomSubmodule;
20+
import org.incode.example.alias.dom.AliasModule;
21+
import org.incode.example.classification.dom.ClassificationModule;
22+
import org.incode.example.commchannel.dom.CommChannelModule;
23+
import org.incode.example.communications.dom.CommunicationsModuleDomModule;
24+
import org.incode.example.docfragment.dom.DocFragmentModuleDomModule;
25+
import org.incode.example.docrendering.freemarker.dom.FreemarkerDocRenderingModule;
26+
import org.incode.example.docrendering.stringinterpolator.dom.StringInterpolatorDocRenderingModule;
27+
import org.incode.example.docrendering.xdocreport.dom.XDocReportDocRenderingModule;
28+
import org.incode.example.document.dom.DocumentModule;
29+
import org.incode.example.note.dom.NoteModule;
30+
31+
import domainapp.appdefn.DomainAppAppManifest;
32+
33+
public class DomainAppAppManifestWithExampleModules extends AppManifestAbstract {
34+
35+
public static final Builder BUILDER = DomainAppAppManifest.BUILDER
36+
.withAdditionalModules(
37+
ExampleAppSubmodule.class,
38+
ExampleDomSubmodule.class,
39+
ExampleDomDemoDomSubmodule.class,
40+
41+
// lib
42+
FreemarkerDocRenderingModule.class,
43+
StringInterpolatorDocRenderingModule.class,
44+
XDocReportDocRenderingModule.class,
45+
DocxModule.class,
46+
ExcelModule.class,
47+
FakeDataModule.class,
48+
FreeMarkerModule.class,
49+
PolyModule.class,
50+
PdfBoxModule.class,
51+
ServletApiModule.class,
52+
StringInterpolatorModule.class,
53+
XDocReportModule.class,
54+
55+
// subdomains (dom)
56+
AliasModule.class,
57+
ClassificationModule.class,
58+
CommChannelModule.class,
59+
CommunicationsModuleDomModule.class,
60+
CountryModule.class,
61+
DocFragmentModuleDomModule.class,
62+
DocumentModule.class,
63+
NoteModule.class,
64+
TagsModule.class
65+
66+
);
67+
68+
public DomainAppAppManifestWithExampleModules() {
69+
super(BUILDER);
70+
}
71+
72+
}

‎ex/app/extended/appdefn/src/main/java/org/incode/domainapp/example/app/DomainAppAppManifestWithExampleModulesAndFixtures.java

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package org.incode.domainapp.example.app;
2+
3+
import java.util.List;
4+
import java.util.Map;
5+
6+
import org.apache.isis.applib.fixturescripts.FixtureScript;
7+
8+
import org.incode.domainapp.example.app.fixtures.RecreateDemoFixtures;
9+
10+
import domainapp.appdefn.seed.security.SeedSuperAdministratorRoleAndSvenSuperUser;
11+
12+
public class DomainAppAppManifestWithExampleModulesAndFixtures extends DomainAppAppManifestWithExampleModules {
13+
14+
@Override protected void overrideFixtures(final List<Class<? extends FixtureScript>> fixtureScripts) {
15+
fixtureScripts.add(RecreateDemoFixtures.class);
16+
fixtureScripts.add(SeedSuperAdministratorRoleAndSvenSuperUser.class);
17+
}
18+
19+
@Override
20+
protected void overrideConfigurationProperties(final Map<String, String> configurationProperties) {
21+
disableAuditingAndCommandAndPublishGlobally(configurationProperties);
22+
}
23+
24+
protected void disableAuditingAndCommandAndPublishGlobally(final Map<String, String> configurationProperties) {
25+
configurationProperties.put("isis.services.audit.objects","none");
26+
configurationProperties.put("isis.services.command.actions","none");
27+
configurationProperties.put("isis.services.publish.objects","none");
28+
configurationProperties.put("isis.services.publish.actions","none");
29+
configurationProperties.put("isis.services.publish.properties","none");
30+
}
31+
}

‎ex/app/extended/appdefn/src/main/java/org/incode/domainapp/example/app/ExampleAppSubmodule.java

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
package org.incode.domainapp.example.app;
2+
3+
import javax.xml.bind.annotation.XmlRootElement;
4+
5+
import org.apache.isis.applib.ModuleAbstract;
6+
7+
@XmlRootElement(name = "module")
8+
public class ExampleAppSubmodule extends ModuleAbstract {
9+
10+
public static class PropertyDomainEvent<S,T>
11+
extends org.apache.isis.applib.services.eventbus.PropertyDomainEvent<S,T> {}
12+
public static class CollectionDomainEvent<S,T>
13+
extends org.apache.isis.applib.services.eventbus.CollectionDomainEvent<S,T> {}
14+
public static class ActionDomainEvent<S> extends
15+
org.apache.isis.applib.services.eventbus.ActionDomainEvent<S> {}
16+
17+
}

‎ex/app/extended/appdefn/src/main/java/org/incode/domainapp/example/app/fixtures/DomainAppWithExampleModulesFixtureScriptsSpecProvider.java

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
package org.incode.domainapp.example.app.fixtures;
2+
3+
import org.apache.isis.applib.annotation.DomainService;
4+
import org.apache.isis.applib.annotation.NatureOfService;
5+
import org.apache.isis.applib.fixturescripts.FixtureScripts;
6+
import org.apache.isis.applib.services.fixturespec.FixtureScriptsSpecification;
7+
import org.apache.isis.applib.services.fixturespec.FixtureScriptsSpecificationProvider;
8+
9+
@DomainService(
10+
nature = NatureOfService.DOMAIN,
11+
menuOrder = "100"
12+
)
13+
public class DomainAppWithExampleModulesFixtureScriptsSpecProvider implements FixtureScriptsSpecificationProvider {
14+
15+
@Override
16+
public FixtureScriptsSpecification getSpecification() {
17+
return FixtureScriptsSpecification
18+
.builder("org.incode.domainapp.example")
19+
.with(FixtureScripts.MultipleExecutionStrategy.EXECUTE)
20+
.with(FixtureScripts.NonPersistedObjectsStrategy.PERSIST)
21+
.withRunScriptDefault(RecreateDemoFixtures.class)
22+
.withRunScriptDropDown(FixtureScriptsSpecification.DropDownPolicy.CHOICES)
23+
.withRecreate(RecreateDemoFixtures.class)
24+
.build();
25+
}
26+
27+
}

0 commit comments

Comments
 (0)