vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2025-09-09 09:09:38 +02:00
Code Issues Releases Wiki Activity

Enable OSGi compliance via 'DynamicImport-Package: *'

Browse source 
on package layer instead of Declarative Service (DS) approach.
Restructuring and cleanup of initialization process to ensure that all
internal config files are found by the corresponding bundle
classloaders.

SMACK-343
This commit is contained in:
Christoph Fiehe 2014-12-18 12:57:21 +01:00 • committed by Florian Schmaus
parent 1f38e4ca0d
commit 665e7914f2
38 changed files with 46 additions and 191 deletions
Download patch file Download diff file Expand all files Collapse all files

6
smack-experimental/src/main/java/org/jivesoftware/smack/initializer/experimental/ExperimentalInitializer.java → smack-experimental/src/main/java/org/jivesoftware/smack/experimental/ExperimentalInitializer.java
View file

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jivesoftware.smack.initializer.experimental;
package org.jivesoftware.smack.experimental;
import org.jivesoftware.smack.initializer.UrlInitializer;
@ -27,11 +27,11 @@ public class ExperimentalInitializer extends UrlInitializer {
@Override
protected String getProvidersUrl() {
return "classpath:org.jivesoftware.smackx/experimental.providers";
return "classpath:org.jivesoftware.smack.experimental/experimental.providers";
}
@Override
protected String getConfigUrl() {
return "classpath:org.jivesoftware.smackx/experimental.xml";
return "classpath:org.jivesoftware.smack.experimental/experimental.xml";
}
}

0
smack-experimental/src/main/resources/org.jivesoftware.smackx/experimental.providers → smack-experimental/src/main/resources/org.jivesoftware.smack.experimental/experimental.providers
View file

0
smack-experimental/src/main/resources/org.jivesoftware.smackx/experimental.xml → smack-experimental/src/main/resources/org.jivesoftware.smack.experimental/experimental.xml
View file

6
smack-experimental/src/main/resources/org.jivesoftware.smackx/smack-experimental-components.xml
View file

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.2.0"
enabled="true" immediate="true" name="Smack Experimental API">
<implementation
class="org.jivesoftware.smack.initializer.experimental.ExperimentalInitializer" />
</scr:component>

2
smack-experimental/src/test/java/org/jivesoftware/smackx/ExperimentalInitializerTest.java
View file

@ -20,7 +20,7 @@ import static org.junit.Assert.assertTrue;
import java.util.List;
import org.jivesoftware.smack.initializer.experimental.ExperimentalInitializer;
import org.jivesoftware.smack.experimental.ExperimentalInitializer;
import org.junit.Test;
public class ExperimentalInitializerTest {