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

Commit 2a1e6f9

Browse files
danhaywooddanhaywood
committed
#87 - document compiles, wip
1 parent c5d069a commit 2a1e6f9

File tree

142 files changed

+112
-5717
lines changed

Some content is hidden

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

142 files changed

+112
-5717
lines changed

‎modules/examples/document/demo/pom.xml

+3-131
Original file line numberDiff line numberDiff line change
@@ -92,71 +92,11 @@
9292
<artifactId>axon-core</artifactId>
9393
</dependency>
9494

95-
<!--
96-
<dependency>
97-
<groupId>org.isisaddons.module.docx</groupId>
98-
<artifactId>isis-module-docx-dom</artifactId>
99-
</dependency>
100-
<dependency>
101-
<groupId>org.jdom</groupId>
102-
<artifactId>jdom2</artifactId>
103-
<version>2.0.3</version>
104-
</dependency>
105-
106-
<dependency>
107-
<groupId>org.isisaddons.module.excel</groupId>
108-
<artifactId>isis-module-excel-dom</artifactId>
109-
</dependency>
110-
111-
<dependency>
112-
<groupId>org.isisaddons.module.fakedata</groupId>
113-
<artifactId>isis-module-fakedata-dom</artifactId>
114-
</dependency>
115-
116-
<dependency>
117-
<groupId>org.isisaddons.module.poly</groupId>
118-
<artifactId>isis-module-poly-dom</artifactId>
119-
</dependency>
120-
121-
<dependency>
122-
<groupId>org.isisaddons.module.servletapi</groupId>
123-
<artifactId>isis-module-servletapi-dom</artifactId>
124-
</dependency>
125-
126-
<dependency>
127-
<groupId>org.isisaddons.module.stringinterpolator</groupId>
128-
<artifactId>isis-module-stringinterpolator-dom</artifactId>
129-
</dependency>
130-
131-
<dependency>
132-
<groupId>org.incode.example.alias</groupId>
133-
<artifactId>incode-example-alias-dom</artifactId>
134-
</dependency>
135-
136-
<dependency>
137-
<groupId>org.incode.example.classification</groupId>
138-
<artifactId>incode-example-classification-dom</artifactId>
139-
</dependency>
140-
141-
<dependency>
142-
<groupId>org.incode.example.commchannel</groupId>
143-
<artifactId>incode-example-commchannel-dom</artifactId>
144-
</dependency>
145-
146-
<dependency>
147-
<groupId>org.incode.example.communications</groupId>
148-
<artifactId>incode-example-communications-dom</artifactId>
149-
</dependency>
150-
151-
<dependency>
152-
<groupId>org.incode.example.docfragment</groupId>
153-
<artifactId>incode-example-docfragment-dom</artifactId>
154-
</dependency>
155-
15695
<dependency>
15796
<groupId>org.incode.example.document</groupId>
15897
<artifactId>incode-example-document-dom</artifactId>
15998
</dependency>
99+
160100
<dependency>
161101
<groupId>org.incode.example.docrendering</groupId>
162102
<artifactId>incode-example-docrendering-stringinterpolator-dom</artifactId>
@@ -171,77 +111,9 @@
171111
</dependency>
172112

173113
<dependency>
174-
<groupId>org.incode.example.note</groupId>
175-
<artifactId>incode-example-note-dom</artifactId>
176-
</dependency>
177-
178-
<dependency>
179-
<groupId>org.incode.example.settings</groupId>
180-
<artifactId>incode-example-settings-dom</artifactId>
181-
</dependency>
182-
183-
<dependency>
184-
<groupId>org.incode.example.tags</groupId>
185-
<artifactId>incode-example-tags-dom</artifactId>
186-
</dependency>
187-
188-
<dependency>
189-
<groupId>org.isisaddons.module.audit</groupId>
190-
<artifactId>isis-module-audit-dom</artifactId>
191-
</dependency>
192-
193-
<dependency>
194-
<groupId>org.isisaddons.module.command</groupId>
195-
<artifactId>isis-module-command-dom</artifactId>
196-
</dependency>
197-
198-
<dependency>
199-
<groupId>org.isisaddons.module.publishmq</groupId>
200-
<artifactId>isis-module-publishmq-dom-jdo</artifactId>
201-
</dependency>
202-
203-
<dependency>
204-
<groupId>org.isisaddons.module.security</groupId>
205-
<artifactId>isis-module-security-dom</artifactId>
206-
</dependency>
207-
208-
<dependency>
209-
<groupId>org.isisaddons.module.sessionlogger</groupId>
210-
<artifactId>isis-module-sessionlogger-dom</artifactId>
211-
</dependency>
212-
213-
<dependency>
214-
<groupId>org.isisaddons.wicket.fullcalendar2</groupId>
215-
<artifactId>isis-wicket-fullcalendar2-cpt</artifactId>
216-
</dependency>
217-
218-
<dependency>
219-
<groupId>org.isisaddons.wicket.gmap3</groupId>
220-
<artifactId>isis-wicket-gmap3-cpt</artifactId>
221-
</dependency>
222-
223-
<dependency>
224-
<groupId>org.isisaddons.wicket.pdfjs</groupId>
225-
<artifactId>isis-wicket-pdfjs-cpt</artifactId>
226-
</dependency>
227-
228-
<dependency>
229-
<groupId>org.isisaddons.wicket.summernote</groupId>
230-
<artifactId>isis-wicket-summernote-cpt</artifactId>
231-
</dependency>
232-
233-
<dependency>
234-
<groupId>org.isisaddons.wicket.wickedcharts</groupId>
235-
<artifactId>isis-wicket-wickedcharts-cpt</artifactId>
236-
</dependency>
237-
238-
239-
<dependency>
240-
<groupId>org.togglz</groupId>
241-
<artifactId>togglz-junit</artifactId>
242-
<scope>test</scope>
114+
<groupId>org.isisaddons.module.fakedata</groupId>
115+
<artifactId>isis-module-fakedata-dom</artifactId>
243116
</dependency>
244-
-->
245117

246118
<!-- test -->
247119
<dependency>

‎modules/examples/document/demo/src/main/java/org/incode/domainapp/extended/module/fixtures/per_cpt/examples/document/FixturesModuleExamplesDocumentIntegrationSubmodule.java ‎modules/examples/document/demo/src/main/java/org/incode/domainapp/extended/module/fixtures/per_cpt/examples/document/DocumentDemoUsageModule.java

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

33
import java.util.Set;
44

@@ -14,17 +14,17 @@
1414
import org.isisaddons.module.command.CommandModule;
1515
import org.isisaddons.module.fakedata.FakeDataModule;
1616

17-
import org.incode.example.alias.demo.examples.document.dom.paperclips.demowithurl.PaperclipForDemoObjectWithUrl;
18-
import org.incode.example.alias.demo.examples.document.dom.paperclips.other.PaperclipForOtherObject;
19-
import org.incode.examples.commchannel.demo.shared.demowithurl.FixturesModuleSharedDemoWithUrlSubmodule;
20-
import org.incode.examples.commchannel.demo.shared.other.FixturesModuleSharedOtherSubmodule;
17+
import org.incode.domainapp.extended.module.fixtures.per_cpt.examples.document.dom.paperclips.demowithurl.PaperclipForDemoObjectWithUrl;
18+
import org.incode.domainapp.extended.module.fixtures.per_cpt.examples.document.dom.paperclips.other.PaperclipForOtherObject;
19+
import org.incode.domainapp.extended.module.fixtures.shared.demowithurl.FixturesModuleSharedDemoWithUrlSubmodule;
20+
import org.incode.domainapp.extended.module.fixtures.shared.other.FixturesModuleSharedOtherSubmodule;
2121
import org.incode.example.docrendering.freemarker.FreemarkerDocRenderingModule;
2222
import org.incode.example.docrendering.stringinterpolator.StringInterpolatorDocRenderingModule;
2323
import org.incode.example.docrendering.xdocreport.XDocReportDocRenderingModule;
2424
import org.incode.example.document.DocumentModule;
2525

2626
@XmlRootElement(name = "module")
27-
public class FixturesModuleExamplesDocumentIntegrationSubmodule extends ModuleAbstract {
27+
public class DocumentDemoUsageModule extends ModuleAbstract {
2828

2929
@Override public Set<Module> getDependencies() {
3030
return Sets.newHashSet(

‎modules/examples/document/demo/src/main/java/org/incode/domainapp/extended/module/fixtures/per_cpt/examples/document/app/FakeScheduler.java

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

33
import java.util.List;
44

‎modules/examples/document/demo/src/main/java/org/incode/domainapp/extended/module/fixtures/per_cpt/examples/document/dom/applicability/aa/AttachAdvisorOfDocAttachedToDemoInvceWillAttachToSame.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
package org.incode.example.alias.demo.examples.document.dom.applicability.aa;
1+
package org.incode.domainapp.extended.module.fixtures.per_cpt.examples.document.dom.applicability.aa;
22

33
import java.util.Collections;
44
import java.util.List;
55
import java.util.Optional;
66

77
import javax.inject.Inject;
88

9+
import org.incode.domainapp.extended.module.fixtures.shared.demowithnotes.dom.DemoInvoice;
910
import org.incode.example.document.dom.impl.applicability.AttachmentAdvisorAbstract;
1011
import org.incode.example.document.dom.impl.docs.Document;
1112
import org.incode.example.document.dom.impl.docs.DocumentTemplate;
1213
import org.incode.example.document.dom.impl.paperclips.Paperclip;
1314
import org.incode.example.document.dom.impl.paperclips.PaperclipRepository;
14-
import org.incode.examples.commchannel.demo.shared.demowithnotes.dom.DemoInvoice;
1515

1616
public class AttachAdvisorOfDocAttachedToDemoInvceWillAttachToSame extends
1717
AttachmentAdvisorAbstract<Document> {

‎modules/examples/document/demo/src/main/java/org/incode/domainapp/extended/module/fixtures/per_cpt/examples/document/dom/applicability/aa/ForDemoObjectAlsoAttachToFirstOtherObject.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.incode.example.alias.demo.examples.document.dom.applicability.aa;
1+
package org.incode.domainapp.extended.module.fixtures.per_cpt.examples.document.dom.applicability.aa;
22

33
import java.util.List;
44
import java.util.Optional;
@@ -9,12 +9,12 @@
99

1010
import org.apache.isis.applib.services.repository.RepositoryService;
1111

12+
import org.incode.domainapp.extended.module.fixtures.shared.demowithurl.dom.DemoObjectWithUrl;
13+
import org.incode.domainapp.extended.module.fixtures.shared.other.dom.OtherObject;
1214
import org.incode.example.document.dom.impl.applicability.AttachmentAdvisor;
1315
import org.incode.example.document.dom.impl.applicability.AttachmentAdvisorAbstract;
1416
import org.incode.example.document.dom.impl.docs.Document;
1517
import org.incode.example.document.dom.impl.docs.DocumentTemplate;
16-
import org.incode.examples.commchannel.demo.shared.demowithurl.dom.DemoObjectWithUrl;
17-
import org.incode.examples.commchannel.demo.shared.other.dom.OtherObject;
1818

1919
public class ForDemoObjectAlsoAttachToFirstOtherObject extends
2020
AttachmentAdvisorAbstract<DemoObjectWithUrl> {

‎modules/examples/document/demo/src/main/java/org/incode/domainapp/extended/module/fixtures/per_cpt/examples/document/dom/applicability/aa/ForDemoObjectAttachToSame.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
package org.incode.example.alias.demo.examples.document.dom.applicability.aa;
1+
package org.incode.domainapp.extended.module.fixtures.per_cpt.examples.document.dom.applicability.aa;
22

33
import java.util.Collections;
44
import java.util.List;
55

6+
import org.incode.domainapp.extended.module.fixtures.shared.demowithurl.dom.DemoObjectWithUrl;
67
import org.incode.example.document.dom.impl.applicability.AttachmentAdvisor;
78
import org.incode.example.document.dom.impl.applicability.AttachmentAdvisorAbstract;
89
import org.incode.example.document.dom.impl.docs.Document;
910
import org.incode.example.document.dom.impl.docs.DocumentTemplate;
10-
import org.incode.examples.commchannel.demo.shared.demowithurl.dom.DemoObjectWithUrl;
1111

1212
import lombok.Value;
1313

‎modules/examples/document/demo/src/main/java/org/incode/domainapp/extended/module/fixtures/per_cpt/examples/document/dom/applicability/rmf/FreemarkerModelOfDemoObject.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package org.incode.example.alias.demo.examples.document.dom.applicability.rmf;
1+
package org.incode.domainapp.extended.module.fixtures.per_cpt.examples.document.dom.applicability.rmf;
22

3+
import org.incode.domainapp.extended.module.fixtures.shared.demowithurl.dom.DemoObjectWithUrl;
34
import org.incode.example.document.dom.impl.applicability.RendererModelFactoryAbstract;
45
import org.incode.example.document.dom.impl.docs.DocumentTemplate;
5-
import org.incode.examples.commchannel.demo.shared.demowithurl.dom.DemoObjectWithUrl;
66

77
import lombok.Value;
88

‎modules/examples/document/demo/src/main/java/org/incode/domainapp/extended/module/fixtures/per_cpt/examples/document/dom/applicability/rmf/RenderModelFactoryOfDocumentAttachedToDemoInvoice.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
package org.incode.example.alias.demo.examples.document.dom.applicability.rmf;
1+
package org.incode.domainapp.extended.module.fixtures.per_cpt.examples.document.dom.applicability.rmf;
22

33
import java.util.List;
44

55
import javax.inject.Inject;
66

7+
import org.incode.domainapp.extended.module.fixtures.shared.demowithnotes.dom.DemoInvoice;
8+
import org.incode.domainapp.extended.module.fixtures.shared.demowithnotes.dom.DemoObjectWithNotes;
79
import org.incode.example.document.dom.impl.applicability.RendererModelFactoryAbstract;
810
import org.incode.example.document.dom.impl.docs.Document;
911
import org.incode.example.document.dom.impl.docs.DocumentTemplate;
1012
import org.incode.example.document.dom.impl.paperclips.Paperclip;
1113
import org.incode.example.document.dom.impl.paperclips.PaperclipRepository;
12-
import org.incode.examples.commchannel.demo.shared.demowithnotes.dom.DemoObjectWithNotes;
13-
import org.incode.examples.commchannel.demo.shared.demowithnotes.dom.DemoInvoice;
1414

1515
import lombok.Value;
1616

‎modules/examples/document/demo/src/main/java/org/incode/domainapp/extended/module/fixtures/per_cpt/examples/document/dom/applicability/rmf/StringInterpolatorRootOfDemoObject.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package org.incode.example.alias.demo.examples.document.dom.applicability.rmf;
1+
package org.incode.domainapp.extended.module.fixtures.per_cpt.examples.document.dom.applicability.rmf;
22

33
import org.isisaddons.module.stringinterpolator.dom.StringInterpolatorService;
44

5+
import org.incode.domainapp.extended.module.fixtures.shared.demowithurl.dom.DemoObjectWithUrl;
56
import org.incode.example.document.dom.impl.applicability.RendererModelFactoryAbstract;
67
import org.incode.example.document.dom.impl.docs.DocumentTemplate;
7-
import org.incode.examples.commchannel.demo.shared.demowithurl.dom.DemoObjectWithUrl;
88

99
import lombok.Getter;
1010

‎modules/examples/document/demo/src/main/java/org/incode/domainapp/extended/module/fixtures/per_cpt/examples/document/dom/applicability/rmf/XDocReportModelOfDemoObject.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
package org.incode.example.alias.demo.examples.document.dom.applicability.rmf;
1+
package org.incode.domainapp.extended.module.fixtures.per_cpt.examples.document.dom.applicability.rmf;
22

33
import java.util.Map;
44

55
import com.google.common.collect.ImmutableMap;
66

77
import org.isisaddons.module.xdocreport.dom.service.XDocReportModel;
88

9+
import org.incode.domainapp.extended.module.fixtures.shared.demowithurl.dom.DemoObjectWithUrl;
910
import org.incode.example.document.dom.impl.applicability.RendererModelFactoryAbstract;
1011
import org.incode.example.document.dom.impl.docs.DocumentTemplate;
11-
import org.incode.examples.commchannel.demo.shared.demowithurl.dom.DemoObjectWithUrl;
1212

1313
import lombok.Getter;
1414

‎modules/examples/document/demo/src/main/java/org/incode/domainapp/extended/module/fixtures/per_cpt/examples/document/dom/menu/DocumentTypeMenu.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.incode.example.alias.demo.examples.document.dom.menu;
1+
package org.incode.domainapp.extended.module.fixtures.per_cpt.examples.document.dom.menu;
22

33
import java.util.List;
44

‎modules/examples/document/demo/src/main/java/org/incode/domainapp/extended/module/fixtures/per_cpt/examples/document/dom/paperclips/demowithurl/PaperclipForDemoObjectWithUrl.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.incode.example.alias.demo.examples.document.dom.paperclips.demowithurl;
1+
package org.incode.domainapp.extended.module.fixtures.per_cpt.examples.document.dom.paperclips.demowithurl;
22

33
import javax.jdo.annotations.Column;
44
import javax.jdo.annotations.IdentityType;
@@ -12,13 +12,13 @@
1212
import org.apache.isis.applib.annotation.NatureOfService;
1313
import org.apache.isis.applib.annotation.Property;
1414

15+
import org.incode.domainapp.extended.module.fixtures.shared.demowithurl.dom.DemoObjectWithUrl;
1516
import org.incode.example.document.dom.impl.paperclips.Paperclip;
1617
import org.incode.example.document.dom.impl.paperclips.PaperclipRepository;
1718
import org.incode.example.document.dom.mixins.T_createAndAttachDocumentAndRender;
1819
import org.incode.example.document.dom.mixins.T_createAndAttachDocumentAndScheduleRender;
1920
import org.incode.example.document.dom.mixins.T_documents;
2021
import org.incode.example.document.dom.mixins.T_preview;
21-
import org.incode.examples.commchannel.demo.shared.demowithurl.dom.DemoObjectWithUrl;
2222

2323
@javax.jdo.annotations.PersistenceCapable(
2424
identityType= IdentityType.DATASTORE,

‎modules/examples/document/demo/src/main/java/org/incode/domainapp/extended/module/fixtures/per_cpt/examples/document/dom/paperclips/other/PaperclipForOtherObject.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.incode.example.alias.demo.examples.document.dom.paperclips.other;
1+
package org.incode.domainapp.extended.module.fixtures.per_cpt.examples.document.dom.paperclips.other;
22

33
import javax.jdo.annotations.Column;
44
import javax.jdo.annotations.IdentityType;
@@ -12,13 +12,13 @@
1212
import org.apache.isis.applib.annotation.NatureOfService;
1313
import org.apache.isis.applib.annotation.Property;
1414

15+
import org.incode.domainapp.extended.module.fixtures.shared.other.dom.OtherObject;
1516
import org.incode.example.document.dom.impl.paperclips.Paperclip;
1617
import org.incode.example.document.dom.impl.paperclips.PaperclipRepository;
1718
import org.incode.example.document.dom.mixins.T_createAndAttachDocumentAndRender;
1819
import org.incode.example.document.dom.mixins.T_createAndAttachDocumentAndScheduleRender;
1920
import org.incode.example.document.dom.mixins.T_documents;
2021
import org.incode.example.document.dom.mixins.T_preview;
21-
import org.incode.examples.commchannel.demo.shared.other.dom.OtherObject;
2222

2323
@javax.jdo.annotations.PersistenceCapable(
2424
identityType= IdentityType.DATASTORE,

‎modules/examples/document/demo/src/main/java/org/incode/domainapp/extended/module/fixtures/per_cpt/examples/document/dom/spiimpl/ApplicationTenancyServiceForDemo.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package org.incode.example.alias.demo.examples.document.dom.spiimpl;
1+
package org.incode.domainapp.extended.module.fixtures.per_cpt.examples.document.dom.spiimpl;
22

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

6-
import org.incode.example.classification.dom.spi.ApplicationTenancyService;
6+
import org.incode.example.document.dom.spi.ApplicationTenancyService;
77

88
@DomainService(
99
nature = NatureOfService.DOMAIN

‎modules/examples/document/demo/src/main/java/org/incode/domainapp/extended/module/fixtures/per_cpt/examples/document/dom/spiimpl/AttachmentAdvisorClassNameServiceForDemo.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.incode.example.alias.demo.examples.document.dom.spiimpl;
1+
package org.incode.domainapp.extended.module.fixtures.per_cpt.examples.document.dom.spiimpl;
22

33
import java.util.List;
44

‎modules/examples/document/demo/src/main/java/org/incode/domainapp/extended/module/fixtures/per_cpt/examples/document/dom/spiimpl/DocumentAttachmentAdvisorForDemo.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.incode.example.alias.demo.examples.document.dom.spiimpl;
1+
package org.incode.domainapp.extended.module.fixtures.per_cpt.examples.document.dom.spiimpl;
22

33
import java.util.List;
44

@@ -9,11 +9,11 @@
99
import org.apache.isis.applib.annotation.DomainService;
1010
import org.apache.isis.applib.annotation.NatureOfService;
1111

12+
import org.incode.domainapp.extended.module.fixtures.per_cpt.examples.document.fixture.seed.DocumentTypeAndTemplatesApplicableForDemoObjectFixture;
1213
import org.incode.example.document.dom.impl.docs.Document;
1314
import org.incode.example.document.dom.impl.types.DocumentType;
1415
import org.incode.example.document.dom.impl.types.DocumentTypeRepository;
1516
import org.incode.example.document.dom.spi.DocumentAttachmentAdvisor;
16-
import org.incode.example.alias.demo.examples.document.fixture.seed.DocumentTypeAndTemplatesApplicableForDemoObjectFixture;
1717

1818
@DomainService(nature = NatureOfService.DOMAIN)
1919
public class DocumentAttachmentAdvisorForDemo implements DocumentAttachmentAdvisor {

‎modules/examples/document/demo/src/main/java/org/incode/domainapp/extended/module/fixtures/per_cpt/examples/document/dom/spiimpl/RendererClassNameServiceForDemo.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.incode.example.alias.demo.examples.document.dom.spiimpl;
1+
package org.incode.domainapp.extended.module.fixtures.per_cpt.examples.document.dom.spiimpl;
22

33
import java.util.List;
44

0 commit comments

Comments
 (0)