Skip to content

Commit 2e89708

Browse files
doolsedoolse
committed
openequella#404 Large merge of plugins and renaming of i18n strings
1 parent 5f0e088 commit 2e89708

File tree

10,277 files changed

+16953
-39426
lines changed

Some content is hidden

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

10,277 files changed

+16953
-39426
lines changed

‎Interface/Plugins/.gitignore

-1
This file was deleted.

‎Interface/Plugins/com.tle.common.interfaces/plugin-jpf.xml

-15
This file was deleted.

‎Interface/Plugins/com.tle.web.api.acl.interfaces/plugin-jpf.xml

-19
This file was deleted.

‎Interface/Plugins/com.tle.web.api.collection.interfaces/plugin-jpf.xml

-16
This file was deleted.

‎Interface/Plugins/com.tle.web.api.institution.interfaces/plugin-jpf.xml

-16
This file was deleted.

‎Interface/Plugins/com.tle.web.api.interfaces/config.properties

-1
This file was deleted.

‎Interface/Plugins/com.tle.web.api.interfaces/plugin-jpf.xml

-13
This file was deleted.

‎Interface/Plugins/com.tle.web.api.item.interfaces/config.properties

-1
This file was deleted.

‎Interface/Plugins/com.tle.web.api.item.interfaces/plugin-jpf.xml

-17
This file was deleted.

‎Interface/Plugins/com.tle.web.api.item.tasks.interfaces/plugin-jpf.xml

-16
This file was deleted.

‎Interface/Plugins/com.tle.web.api.notification.interfaces/plugin-jpf.xml

-18
This file was deleted.

‎Interface/Plugins/com.tle.web.api.oauth.interfaces/plugin-jpf.xml

-17
This file was deleted.

‎Interface/Plugins/com.tle.web.api.schema.interfaces/plugin-jpf.xml

-17
This file was deleted.

‎Interface/Plugins/com.tle.web.api.search.interfaces/plugin-jpf.xml

-16
This file was deleted.

‎Interface/Plugins/com.tle.web.api.staging.interfaces/plugin-jpf.xml

-15
This file was deleted.

‎Interface/Plugins/com.tle.web.api.users.interfaces/plugin-jpf.xml

-15
This file was deleted.

‎Interface/Plugins/com.tle.web.api.workflow.interfaces/plugin-jpf.xml

-18
This file was deleted.

‎Platform/Plugins/com.tle.core.guice/plugin-jpf.xml

+18-25
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,18 @@
1-
<!DOCTYPE plugin PUBLIC "-//JPF//Java Plug-in Manifest 1.0" "http://jpf.sourceforge.net/plugin_1_0.dtd">
2-
<plugin id="com.tle.core.guice" version="1" class="com.tle.core.guice.GuicePlugin">
3-
<requires>
4-
<import plugin-id="javax.inject:javax.inject" exported="true" />
5-
<import plugin-id="com.tle.platform.common" />
6-
<import plugin-id="org.ow2.asm:asm" />
7-
<import plugin-id="com.google.inject:guice" exported="true" />
8-
<import plugin-id="com.google.inject.extensions:guice-assistedinject" exported="true" />
9-
<import plugin-id="org.guice-recipes:guice-recipes-core" />
10-
</requires>
11-
12-
<runtime>
13-
<library type="code" path="classes/" id="classes">
14-
<export prefix="*" />
15-
</library>
16-
</runtime>
17-
18-
<extension-point id="module">
19-
<parameter-def id="class" type="string" multiplicity="any" />
20-
</extension-point>
21-
22-
<extension-point id="beanChecker">
23-
<parameter-def id="class" type="string" />
24-
</extension-point>
25-
</plugin>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plugin PUBLIC "-//JPF//Java Plug-in Manifest 1.0" "http://jpf.sourceforge.net/plugin_1_0.dtd">
3+
<plugin id="com.tle.core.guice" version="1" class="com.tle.core.guice.GuicePlugin">
4+
<requires>
5+
<import plugin-id="com.tle.platform.common" />
6+
</requires>
7+
<runtime>
8+
<library type="code" path="classes/" id="classes">
9+
<export prefix="*" />
10+
</library>
11+
</runtime>
12+
<extension-point id="module">
13+
<parameter-def id="class" type="string" multiplicity="any" />
14+
</extension-point>
15+
<extension-point id="beanChecker">
16+
<parameter-def id="class" type="string" />
17+
</extension-point>
18+
</plugin>

‎Platform/Plugins/com.tle.core.guice/src/com/tle/core/guice/PluginTrackerModule.java

+7-5
Original file line numberDiff line numberDiff line change
@@ -36,27 +36,29 @@
3636

3737
public abstract class PluginTrackerModule extends AbstractModule
3838
{
39+
protected abstract String getPluginId();
40+
3941
public static class TrackerProvider<T> implements Provider<PluginTracker<T>>
4042
{
4143
@Inject
4244
private PluginService pluginService;
4345
private String extensionPoint;
4446
private String beanParameter;
4547
private String idParam;
46-
private Class<?> moduleClass;
48+
private String pluginId;
4749
private Comparator<Extension> comparator;
4850

49-
public TrackerProvider(Class<?> moduleClass, String extensionPoint, String beanParameter)
51+
public TrackerProvider(String pluginId, String extensionPoint, String beanParameter)
5052
{
51-
this.moduleClass = moduleClass;
53+
this.pluginId = pluginId;
5254
this.extensionPoint = extensionPoint;
5355
this.beanParameter = beanParameter;
5456
}
5557

5658
@Override
5759
public PluginTracker<T> get()
5860
{
59-
return new PluginTracker<T>(pluginService, moduleClass, extensionPoint, idParam, comparator)
61+
return new PluginTracker<T>(pluginService, pluginId, extensionPoint, idParam, comparator)
6062
.setBeanKey(beanParameter);
6163
}
6264

@@ -124,7 +126,7 @@ protected <T> TrackerProvider<T> bindTracker(java.lang.reflect.Type typeParam, A
124126
String extensionPoint, String beanParameter)
125127
{
126128
ParameterizedType type = Types.newParameterizedType(PluginTracker.class, typeParam);
127-
TrackerProvider<T> trackerProvider = new TrackerProvider<T>(getClass(), extensionPoint, beanParameter);
129+
TrackerProvider<T> trackerProvider = new TrackerProvider<T>(getPluginId(), extensionPoint, beanParameter);
128130
@SuppressWarnings("unchecked")
129131
TypeLiteral<PluginTracker<T>> typeLiteral = (TypeLiteral<PluginTracker<T>>) TypeLiteral.get(type);
130132
LinkedBindingBuilder<PluginTracker<T>> bindingBuilder = bind(typeLiteral);

‎Platform/Plugins/com.tle.platform.common/plugin-jpf.xml

+10-17
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
1-
<!DOCTYPE plugin PUBLIC "-//JPF//Java Plug-in Manifest 1.0" "http://jpf.sourceforge.net/plugin_1_0.dtd">
2-
<plugin id="com.tle.platform.common" version="1">
3-
<requires>
4-
<import plugin-id="org.slf4j:slf4j-api" exported="true" />
5-
<import plugin-id="commons-logging:commons-logging" exported="true" />
6-
<import plugin-id="commons-codec:commons-codec" exported="true" />
7-
<import plugin-id="com.google.guava:guava" exported="true" />
8-
<import plugin-id="commons-beanutils:commons-beanutils" />
9-
<import plugin-id="org.apache.commons:commons-compress" />
10-
<import plugin-id="jpf:jpf" exported="true" />
11-
</requires>
12-
<runtime>
13-
<library type="code" path="classes/" id="core">
14-
<export prefix="*" />
15-
</library>
16-
</runtime>
17-
</plugin>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plugin PUBLIC "-//JPF//Java Plug-in Manifest 1.0" "http://jpf.sourceforge.net/plugin_1_0.dtd">
3+
<plugin id="com.tle.platform.common" version="1">
4+
<requires />
5+
<runtime>
6+
<library type="code" path="classes/" id="core">
7+
<export prefix="*" />
8+
</library>
9+
</runtime>
10+
</plugin>

‎Platform/Plugins/com.tle.platform.common/src/com/tle/core/plugins/PluginTracker.java

-10
Original file line numberDiff line numberDiff line change
@@ -138,22 +138,12 @@ public List<T> getBeanList()
138138
}
139139
}
140140

141-
public PluginTracker(PluginService service, Class<?> pluginClass, String extensionId, String parameterKey)
142-
{
143-
this(service, service.getPluginIdForObject(pluginClass), extensionId, parameterKey, null);
144-
}
145141

146142
public PluginTracker(PluginService service, String pluginId, String extensionId, String parameterKey)
147143
{
148144
this(service, pluginId, extensionId, parameterKey, null);
149145
}
150146

151-
public PluginTracker(PluginService service, Class<?> pluginClass, String extensionId, String parameterKey,
152-
Comparator<Extension> comparator)
153-
{
154-
this(service, service.getPluginIdForObject(pluginClass), extensionId, parameterKey, comparator);
155-
}
156-
157147
public PluginTracker(PluginService service, String pluginId, String extensionId, String parameterKey,
158148
Comparator<Extension> comparator)
159149
{

0 commit comments

Comments
 (0)