Skip to content

Commit 43671e7

Browse files
committed
Pass class loader as parameter when creating new objects. JMX interactions were failing.
1 parent 05e23f9 commit 43671e7

File tree

24 files changed

+215
-81
lines changed

24 files changed

+215
-81
lines changed

Diff for: bw-calendar-engine-api/bw-calendar-engine-api.iml

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<orderEntry type="module" module-name="bw-calendar-facade" />
1313
<orderEntry type="module" module-name="bw-calendar-annotations" />
1414
<orderEntry type="library" name="Maven: org.bedework:bw-access:4.0.9" level="project" />
15-
<orderEntry type="library" name="Maven: org.bedework:bw-util-caching:4.0.30" level="project" />
15+
<orderEntry type="module" module-name="bw-util-caching" />
1616
<orderEntry type="library" name="Maven: org.bedework:bw-util2-vcard:4.0.8" level="project" />
1717
<orderEntry type="library" name="Maven: org.bedework:bw-util-json:4.0.28" level="project" />
1818
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.0" level="project" />
@@ -28,9 +28,9 @@
2828
<orderEntry type="library" name="Maven: com.sun.mail:javax.mail:1.6.2" level="project" />
2929
<orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
3030
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.0" level="project" />
31-
<orderEntry type="library" name="Maven: org.bedework:bw-webdav:4.0.11" level="project" />
31+
<orderEntry type="module" module-name="bw-webdav" />
3232
<orderEntry type="library" name="Maven: org.bedework:bw-util-servlet:4.1.3" level="project" />
33-
<orderEntry type="library" name="Maven: org.bedework:bw-util-xml:4.0.30" level="project" />
33+
<orderEntry type="module" module-name="bw-util-xml" />
3434
<orderEntry type="module" module-name="bw-caldav-util" />
3535
<orderEntry type="library" name="Maven: org.bedework:bw-xml-caldav:4.0.10" level="project" />
3636
<orderEntry type="library" name="Maven: org.bedework:apache-jdkim-library:0.4" level="project" />
@@ -97,7 +97,7 @@
9797
<orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
9898
<orderEntry type="module" module-name="bw-calendar-sysevents-msgs" />
9999
<orderEntry type="library" name="Maven: org.bedework:bw-util-indexing:4.1.2" level="project" />
100-
<orderEntry type="library" name="Maven: org.bedework:bw-util-misc:4.0.30" level="project" />
100+
<orderEntry type="module" module-name="bw-util-misc" />
101101
<orderEntry type="library" name="Maven: org.bedework:bw-util-logging:5.0.0" level="project" />
102102
<orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.7" level="project" />
103103
<orderEntry type="library" name="Maven: org.bedework:bw-util2-calendar:4.0.8" level="project" />
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,136 @@
1+
/* ********************************************************************
2+
Licensed to Jasig under one or more contributor license
3+
agreements. See the NOTICE file distributed with this work
4+
for additional information regarding copyright ownership.
5+
Jasig licenses this file to you under the Apache License,
6+
Version 2.0 (the "License"); you may not use this file
7+
except in compliance with the License. You may obtain a
8+
copy of the License at:
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing,
13+
software distributed under the License is distributed on
14+
an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
KIND, either express or implied. See the License for the
16+
specific language governing permissions and limitations
17+
under the License.
18+
*/
19+
package org.bedework.indexer;
20+
21+
import org.bedework.calfacade.configs.IndexProperties;
22+
import org.bedework.calfacade.indexing.IndexStatsResponse;
23+
import org.bedework.util.jmx.ConfBaseMBean;
24+
import org.bedework.util.jmx.MBeanInfo;
25+
26+
import java.util.List;
27+
28+
/**
29+
* @author douglm
30+
*
31+
*/
32+
public interface BwIndexCtlMBean extends ConfBaseMBean, IndexProperties {
33+
/**
34+
* @return number of messages processed
35+
*/
36+
long getMessageCount();
37+
38+
/**
39+
* @return count processed
40+
*/
41+
long getCollectionsUpdated();
42+
43+
/**
44+
* @return count processed
45+
*/
46+
long getCollectionsDeleted();
47+
48+
/**
49+
* @return count processed
50+
*/
51+
long getEntitiesUpdated();
52+
53+
/**
54+
* @return count processed
55+
*/
56+
long getEntitiesDeleted();
57+
58+
/** Get the current status of the reindexing process
59+
*
60+
* @return messages as a list
61+
*/
62+
List<String> rebuildStatus();
63+
64+
/** Crawl the db data and create indexes - listener should have been stopped.
65+
*
66+
* @return message
67+
*/
68+
String rebuildIndex();
69+
70+
/** Crawl the db data and reindex the resources - this is done in place.
71+
*
72+
* @return message
73+
*/
74+
String rebuildEntityIndex(String docType);
75+
76+
/** Creates a new index for use by reindex
77+
*
78+
* @return index name.
79+
*/
80+
String newIndexes();
81+
82+
/** Reindex the current docType index into a new index. Used for schema
83+
* changes etc.
84+
*
85+
* @return result.
86+
*/
87+
String reindex(String docType);
88+
89+
/** Move the production index alias to the given index
90+
*
91+
* @param indexName name of index to be aliased
92+
* @return result.
93+
*/
94+
String setProdAlias(final String indexName);
95+
96+
/** Move the production index aliases to the latest index
97+
*
98+
* @return result.
99+
*/
100+
String makeAllProd();
101+
102+
IndexStatsResponse indexStats(String indexName);
103+
104+
/**
105+
* @return list of indexes maintained by indexer.
106+
*/
107+
String listIndexes();
108+
109+
/**
110+
* @return list of purged indexes.
111+
*/
112+
String purgeIndexes();
113+
114+
/** Start the indexer
115+
*
116+
*/
117+
void start();
118+
119+
/** Stop the indexer
120+
*
121+
*/
122+
void stop();
123+
124+
/** Lifecycle
125+
*
126+
* @return true if started
127+
*/
128+
boolean isStarted();
129+
130+
/** (Re)load the configuration
131+
*
132+
* @return status
133+
*/
134+
@MBeanInfo("(Re)load the configuration")
135+
String loadConfig();
136+
}

Diff for: bw-calendar-engine-caldav/bw-calendar-engine-caldav.iml

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<orderEntry type="library" name="Maven: org.bedework:bw-util-indexing:4.1.2" level="project" />
1515
<orderEntry type="module" module-name="bw-calendar-convert" />
1616
<orderEntry type="library" name="Maven: org.bedework:bw-util-tz:4.1.2" level="project" />
17-
<orderEntry type="library" name="Maven: org.bedework:bw-util-caching:4.0.30" level="project" />
17+
<orderEntry type="module" module-name="bw-util-caching" />
1818
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
1919
<orderEntry type="library" name="Maven: com.sun.mail:javax.mail:1.6.2" level="project" />
2020
<orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
@@ -84,9 +84,9 @@
8484
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" />
8585
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.14" level="project" />
8686
<orderEntry type="library" name="Maven: org.bedework:bw-util-security:4.1.3" level="project" />
87-
<orderEntry type="library" name="Maven: org.bedework:bw-webdav:4.0.11" level="project" />
87+
<orderEntry type="module" module-name="bw-webdav" />
8888
<orderEntry type="library" name="Maven: org.bedework:bw-util-servlet:4.1.3" level="project" />
89-
<orderEntry type="library" name="Maven: org.bedework:bw-util-xml:4.0.30" level="project" />
89+
<orderEntry type="module" module-name="bw-util-xml" />
9090
<orderEntry type="module" module-name="bw-caldav-util" />
9191
<orderEntry type="library" name="Maven: org.bedework:bw-ical4j-vcard:1.0.7" level="project" />
9292
<orderEntry type="library" name="Maven: commons-io:commons-io:2.8.0" level="project" />
@@ -95,7 +95,7 @@
9595
<orderEntry type="library" name="Maven: javax.xml.ws:jaxws-api:2.3.1" level="project" />
9696
<orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
9797
<orderEntry type="module" module-name="bw-calendar-sysevents-msgs" />
98-
<orderEntry type="library" name="Maven: org.bedework:bw-util-misc:4.0.30" level="project" />
98+
<orderEntry type="module" module-name="bw-util-misc" />
9999
<orderEntry type="library" name="Maven: org.bedework:bw-util-logging:5.0.0" level="project" />
100100
<orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.7" level="project" />
101101
<orderEntry type="module" module-name="bw-caldav-server" />

Diff for: bw-calendar-engine-caldav/src/main/java/org/bedework/caldav/bwserver/BwSysIntfImpl.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -2577,7 +2577,8 @@ private CalSvcI getSvci(final String account,
25772577
service,publicAdmin,
25782578
allowCreateEprops,
25792579
readonly);
2580-
svci = new CalSvcFactoryDefault().getSvc(pars);
2580+
svci = new CalSvcFactoryDefault().getSvc(
2581+
getClass().getClassLoader(), pars);
25812582

25822583
svci.open();
25832584
svci.beginTransaction();

Diff for: bw-calendar-engine-chgnote/bw-calendar-engine-chgnote.iml

+4-4
Original file line numberDiff line numberDiff line change
@@ -111,18 +111,18 @@
111111
<orderEntry type="module" module-name="bw-calendar-annotations" />
112112
<orderEntry type="library" name="Maven: org.bedework:bw-util2-vcard:4.0.8" level="project" />
113113
<orderEntry type="library" name="Maven: org.bedework:bw-util-json:4.0.28" level="project" />
114-
<orderEntry type="library" name="Maven: org.bedework:bw-webdav:4.0.11" level="project" />
114+
<orderEntry type="module" module-name="bw-webdav" />
115115
<orderEntry type="library" name="Maven: org.bedework:bw-util-servlet:4.1.3" level="project" />
116-
<orderEntry type="library" name="Maven: org.bedework:bw-util-xml:4.0.30" level="project" />
116+
<orderEntry type="module" module-name="bw-util-xml" />
117117
<orderEntry type="module" module-name="bw-caldav-util" />
118118
<orderEntry type="library" name="Maven: org.bedework:bw-xml-synchws:4.0.10" level="project" />
119119
<orderEntry type="library" name="Maven: org.bedework:bw-xml-caldav:4.0.10" level="project" />
120120
<orderEntry type="module" module-name="bw-caldav-server" />
121121
<orderEntry type="module" module-name="bw-calendar-sysevents-msgs" />
122-
<orderEntry type="library" name="Maven: org.bedework:bw-util-caching:4.0.30" level="project" />
122+
<orderEntry type="module" module-name="bw-util-caching" />
123123
<orderEntry type="library" name="Maven: org.bedework:bw-util-logging:5.0.0" level="project" />
124124
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.0" level="project" />
125-
<orderEntry type="library" name="Maven: org.bedework:bw-util-misc:4.0.30" level="project" />
125+
<orderEntry type="module" module-name="bw-util-misc" />
126126
<orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.7" level="project" />
127127
</component>
128128
</module>

Diff for: bw-calendar-engine-core-common/bw-calendar-engine-core-common.iml

+4-4
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<orderEntry type="library" name="Maven: org.bedework:bw-util-logging:5.0.0" level="project" />
3636
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.0" level="project" />
3737
<orderEntry type="library" name="Maven: org.bedework:bw-access:4.0.9" level="project" />
38-
<orderEntry type="library" name="Maven: org.bedework:bw-util-caching:4.0.30" level="project" />
38+
<orderEntry type="module" module-name="bw-util-caching" />
3939
<orderEntry type="library" name="Maven: javax.jms:javax.jms-api:2.0" level="project" />
4040
<orderEntry type="module" module-name="bw-calendar-facade" />
4141
<orderEntry type="module" module-name="bw-calendar-annotations" />
@@ -54,9 +54,9 @@
5454
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
5555
<orderEntry type="library" name="Maven: com.sun.mail:javax.mail:1.6.2" level="project" />
5656
<orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
57-
<orderEntry type="library" name="Maven: org.bedework:bw-webdav:4.0.11" level="project" />
57+
<orderEntry type="module" module-name="bw-webdav" />
5858
<orderEntry type="library" name="Maven: org.bedework:bw-util-servlet:4.1.3" level="project" />
59-
<orderEntry type="library" name="Maven: org.bedework:bw-util-xml:4.0.30" level="project" />
59+
<orderEntry type="module" module-name="bw-util-xml" />
6060
<orderEntry type="module" module-name="bw-caldav-server" />
6161
<orderEntry type="library" name="Maven: javax.xml.soap:javax.xml.soap-api:1.4.0" level="project" />
6262
<orderEntry type="library" name="Maven: org.bedework.ical4j:ical4j:3.0.14" level="project" />
@@ -123,7 +123,7 @@
123123
<orderEntry type="library" name="Maven: org.bedework:bw-util-elasticsearch:4.1.2" level="project" />
124124
<orderEntry type="library" name="Maven: org.bedework:bw-util-config:4.1.3" level="project" />
125125
<orderEntry type="library" name="Maven: org.bedework:bw-util-jmx:4.1.3" level="project" />
126-
<orderEntry type="library" name="Maven: org.bedework:bw-util-misc:4.0.30" level="project" />
126+
<orderEntry type="module" module-name="bw-util-misc" />
127127
<orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.7" level="project" />
128128
<orderEntry type="library" name="Maven: org.elasticsearch:elasticsearch:7.13.0" level="project" />
129129
<orderEntry type="library" name="Maven: org.elasticsearch:elasticsearch-core:7.13.0" level="project" />

Diff for: bw-calendar-engine-core/bw-calendar-engine-core.iml

+4-4
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
<orderEntry type="library" name="Maven: org.bedework:bw-util-logging:5.0.0" level="project" />
8787
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.0" level="project" />
8888
<orderEntry type="library" name="Maven: org.bedework:bw-access:4.0.9" level="project" />
89-
<orderEntry type="library" name="Maven: org.bedework:bw-util-caching:4.0.30" level="project" />
89+
<orderEntry type="module" module-name="bw-util-caching" />
9090
<orderEntry type="library" name="Maven: javax.jms:javax.jms-api:2.0" level="project" />
9191
<orderEntry type="module" module-name="bw-calendar-convert" />
9292
<orderEntry type="library" name="Maven: org.bedework:bw-util-tz:4.1.2" level="project" />
@@ -158,9 +158,9 @@
158158
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.14" level="project" />
159159
<orderEntry type="library" name="Maven: org.bedework:bw-util-indexing:4.1.2" level="project" />
160160
<orderEntry type="library" name="Maven: org.bedework:bw-util-security:4.1.3" level="project" />
161-
<orderEntry type="library" name="Maven: org.bedework:bw-webdav:4.0.11" level="project" />
161+
<orderEntry type="module" module-name="bw-webdav" />
162162
<orderEntry type="library" name="Maven: org.bedework:bw-util-servlet:4.1.3" level="project" />
163-
<orderEntry type="library" name="Maven: org.bedework:bw-util-xml:4.0.30" level="project" />
163+
<orderEntry type="module" module-name="bw-util-xml" />
164164
<orderEntry type="module" module-name="bw-caldav-server" />
165165
<orderEntry type="library" name="Maven: javax.xml.soap:javax.xml.soap-api:1.4.0" level="project" />
166166
<orderEntry type="library" name="Maven: org.bedework:bw-ical4j-vcard:1.0.7" level="project" />
@@ -182,7 +182,7 @@
182182
<orderEntry type="library" name="Maven: org.hibernate:hibernate-ehcache:5.2.5.Final" level="project" />
183183
<orderEntry type="library" name="Maven: net.sf.ehcache:ehcache:2.10.3" level="project" />
184184
<orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
185-
<orderEntry type="library" name="Maven: org.bedework:bw-util-misc:4.0.30" level="project" />
185+
<orderEntry type="module" module-name="bw-util-misc" />
186186
<orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.7" level="project" />
187187
<orderEntry type="library" name="Maven: org.bedework:bw-util2-calendar:4.0.8" level="project" />
188188
<orderEntry type="library" name="Maven: org.bedework:bw-xml-calws-soap:4.0.10" level="project" />

Diff for: bw-calendar-engine-core/src/main/java/org/bedework/calcore/hibernate/CoreResources.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public GetEntityResponse<BwResource> fetchResource(final String href,
9999
final String colPath = href.substring(0, pos);
100100

101101
if (debug()) {
102-
debug("Get resource " + colPath + " -> " + name);
102+
debug("Fetch resource " + colPath + " -> " + name);
103103
}
104104

105105
final GetEntityResponse<BwResource> resp = new GetEntityResponse<>();

Diff for: bw-calendar-engine-dumprestore/bw-calendar-engine-dumprestore.iml

+4-4
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@
8282
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" />
8383
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.14" level="project" />
8484
<orderEntry type="library" name="Maven: org.bedework:bw-util-security:4.1.3" level="project" />
85-
<orderEntry type="library" name="Maven: org.bedework:bw-webdav:4.0.11" level="project" />
85+
<orderEntry type="module" module-name="bw-webdav" />
8686
<orderEntry type="library" name="Maven: org.bedework:bw-util-servlet:4.1.3" level="project" />
87-
<orderEntry type="library" name="Maven: org.bedework:bw-util-xml:4.0.30" level="project" />
87+
<orderEntry type="module" module-name="bw-util-xml" />
8888
<orderEntry type="module" module-name="bw-caldav-util" />
8989
<orderEntry type="library" name="Maven: org.bedework:bw-xml-synchws:4.0.10" level="project" />
9090
<orderEntry type="library" name="Maven: org.bedework:bw-xml-caldav:4.0.10" level="project" />
@@ -106,10 +106,10 @@
106106
<orderEntry type="library" name="Maven: org.bedework:bw-util-jmx:4.1.3" level="project" />
107107
<orderEntry type="library" name="Maven: org.bedework:bw-util-config:4.1.3" level="project" />
108108
<orderEntry type="library" name="Maven: org.bedework:bw-util-logging:5.0.0" level="project" />
109-
<orderEntry type="library" name="Maven: org.bedework:bw-util-misc:4.0.30" level="project" />
109+
<orderEntry type="module" module-name="bw-util-misc" />
110110
<orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.7" level="project" />
111111
<orderEntry type="library" name="Maven: org.bedework:bw-util-tz:4.1.2" level="project" />
112-
<orderEntry type="library" name="Maven: org.bedework:bw-util-caching:4.0.30" level="project" />
112+
<orderEntry type="module" module-name="bw-util-caching" />
113113
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
114114
<orderEntry type="library" name="Maven: com.sun.mail:javax.mail:1.6.2" level="project" />
115115
<orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />

Diff for: bw-calendar-engine-dumprestore/src/main/java/org/bedework/dumprestore/BwDumpRestore.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import org.bedework.calsvci.RestoreIntf.FixAliasResult;
3737
import org.bedework.dumprestore.dump.Dump;
3838
import org.bedework.dumprestore.restore.Restore;
39-
import org.bedework.calfacade.indexing.BwIndexCtlMBean;
39+
import org.bedework.indexer.BwIndexCtlMBean;
4040
import org.bedework.util.jmx.ConfBase;
4141
import org.bedework.util.jmx.MBeanUtil;
4242
import org.bedework.util.misc.Util;

0 commit comments

Comments
 (0)