diff options
author | Decebal Suiu <decebal.suiu@gmail.com> | 2017-09-20 16:55:30 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-20 16:55:30 +0200 |
commit | 5916ee64d9c05a4f085f6f6562ed383ff3203e4a (patch) | |
tree | 0255541afe778984d2becf450ecbb90d97e595d7 /demo_gradle | |
parent | b8cd3af90f8149e5003ea1db395d67b0fa8f7066 (diff) | |
download | pf4j-5916ee64d9c05a4f085f6f6562ed383ff3203e4a.tar.gz pf4j-5916ee64d9c05a4f085f6f6562ed383ff3203e4a.zip |
Change root package from ro.fortsoft.pf4j to org.pf4j (#168)
Diffstat (limited to 'demo_gradle')
16 files changed, 100 insertions, 99 deletions
diff --git a/demo_gradle/api/build.gradle b/demo_gradle/api/build.gradle index 774655d..616520e 100644 --- a/demo_gradle/api/build.gradle +++ b/demo_gradle/api/build.gradle @@ -1,5 +1,5 @@ dependencies { - compile 'ro.fortsoft.pf4j:pf4j:1.3.0' - compile 'org.apache.commons:commons-lang3:3.0' - testCompile group: 'junit', name: 'junit', version: '4.+' + compile 'org.pf4j:pf4j:1.4.0-SNAPSHOT' + compile 'org.apache.commons:commons-lang3:3.0' + testCompile group: 'junit', name: 'junit', version: '4.+' } diff --git a/demo_gradle/api/src/main/java/ro/fortsoft/pf4j/demo/api/Greeting.java b/demo_gradle/api/src/main/java/org/pf4j/demo/api/Greeting.java index c451b09..1e4a767 100644 --- a/demo_gradle/api/src/main/java/ro/fortsoft/pf4j/demo/api/Greeting.java +++ b/demo_gradle/api/src/main/java/org/pf4j/demo/api/Greeting.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package ro.fortsoft.pf4j.demo.api; +package org.pf4j.demo.api; -import ro.fortsoft.pf4j.ExtensionPoint; +import org.pf4j.ExtensionPoint; /** * @author Decebal Suiu */ public interface Greeting extends ExtensionPoint { - public String getGreeting(); + String getGreeting(); } diff --git a/demo_gradle/app/build.gradle b/demo_gradle/app/build.gradle index 2478937..cd473b6 100644 --- a/demo_gradle/app/build.gradle +++ b/demo_gradle/app/build.gradle @@ -1,16 +1,16 @@ -apply plugin:'application' +apply plugin: 'application' -mainClassName = 'ro.fortsoft.pf4j.demo.Boot' +mainClassName = 'org.pf4j.demo.Boot' dependencies { - compile project(':api') - compile 'ro.fortsoft.pf4j:pf4j:1.3.0' - compile 'org.apache.commons:commons-lang3:3.5' - testCompile group: 'junit', name: 'junit', version: '4.+' - compile group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.25' + compile project(':api') + compile 'org.pf4j:pf4j:1.4.0-SNAPSHOT' + compile 'org.apache.commons:commons-lang3:3.5' + testCompile group: 'junit', name: 'junit', version: '4.+' + compile group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.25' } jar { - baseName = 'Plugin Demo' - version = '0.1.0' + baseName = 'Plugin Demo' + version = '0.1.0' } diff --git a/demo_gradle/app/src/main/java/ro/fortsoft/pf4j/demo/Boot.java b/demo_gradle/app/src/main/java/org/pf4j/demo/Boot.java index d3e1502..46261d6 100644 --- a/demo_gradle/app/src/main/java/ro/fortsoft/pf4j/demo/Boot.java +++ b/demo_gradle/app/src/main/java/org/pf4j/demo/Boot.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package ro.fortsoft.pf4j.demo; +package org.pf4j.demo; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import ro.fortsoft.pf4j.DefaultPluginManager; -import ro.fortsoft.pf4j.PluginManager; -import ro.fortsoft.pf4j.PluginWrapper; -import ro.fortsoft.pf4j.demo.api.Greeting; +import org.pf4j.DefaultPluginManager; +import org.pf4j.PluginManager; +import org.pf4j.PluginWrapper; +import org.pf4j.demo.api.Greeting; import java.util.List; diff --git a/demo_gradle/app/src/main/java/ro/fortsoft/pf4j/demo/WhazzupGreeting.java b/demo_gradle/app/src/main/java/org/pf4j/demo/WhazzupGreeting.java index e182f2a..c742127 100644 --- a/demo_gradle/app/src/main/java/ro/fortsoft/pf4j/demo/WhazzupGreeting.java +++ b/demo_gradle/app/src/main/java/org/pf4j/demo/WhazzupGreeting.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package ro.fortsoft.pf4j.demo; +package org.pf4j.demo; -import ro.fortsoft.pf4j.Extension; -import ro.fortsoft.pf4j.demo.api.Greeting; +import org.pf4j.Extension; +import org.pf4j.demo.api.Greeting; /** * @author Decebal Suiu diff --git a/demo_gradle/app/src/main/resources/log4j.properties b/demo_gradle/app/src/main/resources/log4j.properties index 16ce034..f42e226 100644 --- a/demo_gradle/app/src/main/resources/log4j.properties +++ b/demo_gradle/app/src/main/resources/log4j.properties @@ -3,9 +3,9 @@ log4j.rootLogger=DEBUG, Console # # PF4J log # -log4j.logger.ro.fortsoft.pf4j=DEBUG, Console -log4j.logger.ro.fortsoft.pf4j.PluginClassLoader=WARN, Console -log4j.additivity.ro.fortsoft.pf4j=false +log4j.logger.org.pf4j=DEBUG, Console +log4j.logger.org.pf4j.PluginClassLoader=WARN, Console +log4j.additivity.org.pf4j=false # # Appenders diff --git a/demo_gradle/build.gradle b/demo_gradle/build.gradle index e38a949..d86746d 100644 --- a/demo_gradle/build.gradle +++ b/demo_gradle/build.gradle @@ -1,10 +1,10 @@ subprojects { - apply plugin: 'java' + apply plugin: 'java' - repositories { - mavenLocal() - mavenCentral() - } + repositories { + mavenLocal() + mavenCentral() + } } task copyPlugins() { @@ -14,7 +14,7 @@ task copyPlugins() { subprojects.each { p -> if (p.path.contains(":plugins/")) { - System.out.println("Copying plugin from " + p.path); + System.out.println("Copying plugin from " + p.path); copy { from p.projectDir.toString() + '/build/libs' into 'app/plugins' diff --git a/demo_gradle/plugins/plugin1/build.gradle b/demo_gradle/plugins/plugin1/build.gradle index 596101e..f0998a1 100644 --- a/demo_gradle/plugins/plugin1/build.gradle +++ b/demo_gradle/plugins/plugin1/build.gradle @@ -2,31 +2,32 @@ jar { baseName = 'WelcomePlugin' version = '0.1.0' manifest { - attributes 'Plugin-Class' : 'ro.fortsoft.pf4j.demo.welcome.WelcomePlugin', - 'Plugin-Id' : 'WelcomePlugin', - 'Plugin-Version' : '1.0.0', - 'Plugin-Provider' : 'Decebal Suiu' + attributes 'Plugin-Class': 'org.pf4j.demo.welcome.WelcomePlugin', + 'Plugin-Id': 'WelcomePlugin', + 'Plugin-Version': '1.0.0', + 'Plugin-Provider': 'Decebal Suiu' } } task plugin(type: Jar) { - baseName = 'WelcomePlugin' - version = '0.1.0' - into('classes'){ - with jar - } - into('lib'){ - from configurations.compile - } - extension('zip') + baseName = 'WelcomePlugin' + version = '0.1.0' + into('classes') { + with jar + } + into('lib') { + from configurations.compile + } + extension('zip') } assemble.dependsOn plugin dependencies { - compileOnly project(':api') // compileOnly important!!! We do not want to put the api into the zip file since the main program has it already! - compile ('ro.fortsoft.pf4j:pf4j:1.3.0') { - exclude group: "org.slf4j" - } - compile 'org.apache.commons:commons-lang3:3.5' - testCompile group: 'junit', name: 'junit', version: '4.+' + compileOnly project(':api') + // compileOnly important!!! We do not want to put the api into the zip file since the main program has it already! + compile('org.pf4j:pf4j:1.4.0-SNAPSHOT') { + exclude group: "org.slf4j" + } + compile 'org.apache.commons:commons-lang3:3.5' + testCompile group: 'junit', name: 'junit', version: '4.+' } diff --git a/demo_gradle/plugins/plugin1/plugin.properties b/demo_gradle/plugins/plugin1/plugin.properties index 4f95d99..9da9bcc 100644 --- a/demo_gradle/plugins/plugin1/plugin.properties +++ b/demo_gradle/plugins/plugin1/plugin.properties @@ -1,5 +1,5 @@ plugin.id=welcome-plugin -plugin.class=ro.fortsoft.pf4j.demo.welcome.WelcomePlugin +plugin.class=org.pf4j.demo.welcome.WelcomePlugin plugin.version=0.0.1 plugin.provider=Decebal Suiu plugin.dependencies= diff --git a/demo_gradle/plugins/plugin1/src/main/java/ro/fortsoft/pf4j/demo/welcome/WelcomePlugin.java b/demo_gradle/plugins/plugin1/src/main/java/org/pf4j/demo/welcome/WelcomePlugin.java index 46ca250..040c9fd 100644 --- a/demo_gradle/plugins/plugin1/src/main/java/ro/fortsoft/pf4j/demo/welcome/WelcomePlugin.java +++ b/demo_gradle/plugins/plugin1/src/main/java/org/pf4j/demo/welcome/WelcomePlugin.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package ro.fortsoft.pf4j.demo.welcome; +package org.pf4j.demo.welcome; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import ro.fortsoft.pf4j.Extension; -import ro.fortsoft.pf4j.Plugin; -import ro.fortsoft.pf4j.PluginWrapper; -import ro.fortsoft.pf4j.demo.api.Greeting; +import org.pf4j.Extension; +import org.pf4j.Plugin; +import org.pf4j.PluginWrapper; +import org.pf4j.demo.api.Greeting; /** * @author Decebal Suiu diff --git a/demo_gradle/plugins/plugin2/build.gradle b/demo_gradle/plugins/plugin2/build.gradle index 3a96d1e..0e292fb 100644 --- a/demo_gradle/plugins/plugin2/build.gradle +++ b/demo_gradle/plugins/plugin2/build.gradle @@ -1,32 +1,33 @@ jar { - baseName = 'HelloPlugin' - version = '0.1.0' - manifest { - attributes 'Plugin-Class' : 'ro.fortsoft.pf4j.demo.hello.HelloPlugin', - 'Plugin-Id' : 'HelloPlugin', - 'Plugin-Version' : '1.0.0', - 'Plugin-Provider' : 'Decebal Suiu' - } + baseName = 'HelloPlugin' + version = '0.1.0' + manifest { + attributes 'Plugin-Class': 'org.pf4j.demo.hello.HelloPlugin', + 'Plugin-Id': 'HelloPlugin', + 'Plugin-Version': '1.0.0', + 'Plugin-Provider': 'Decebal Suiu' + } } task plugin(type: Jar) { - baseName = 'HelloPlugin' - version = '0.1.0' - into('classes'){ - with jar - } - into('lib'){ - from configurations.compile - } - extension('zip') + baseName = 'HelloPlugin' + version = '0.1.0' + into('classes') { + with jar + } + into('lib') { + from configurations.compile + } + extension('zip') } assemble.dependsOn plugin dependencies { - compileOnly project(':api') // compileOnly important!!! We do not want to put the api into the zip file since the main program has it already! - compile ('ro.fortsoft.pf4j:pf4j:1.3.0') { - exclude group: "org.slf4j" - } - compile 'org.apache.commons:commons-lang3:3.5' - testCompile group: 'junit', name: 'junit', version: '4.+' + compileOnly project(':api') + // compileOnly important!!! We do not want to put the api into the zip file since the main program has it already! + compile('org.pf4j:pf4j:1.4.0-SNAPSHOT') { + exclude group: "org.slf4j" + } + compile 'org.apache.commons:commons-lang3:3.5' + testCompile group: 'junit', name: 'junit', version: '4.+' } diff --git a/demo_gradle/plugins/plugin2/plugin.properties b/demo_gradle/plugins/plugin2/plugin.properties index 0de45e6..60b6f33 100644 --- a/demo_gradle/plugins/plugin2/plugin.properties +++ b/demo_gradle/plugins/plugin2/plugin.properties @@ -1,5 +1,5 @@ plugin.id=hello-plugin -plugin.class=ro.fortsoft.pf4j.demo.hello.HelloPlugin +plugin.class=org.pf4j.demo.hello.HelloPlugin plugin.version=0.0.1 plugin.provider=Decebal Suiu plugin.dependencies= diff --git a/demo_gradle/plugins/plugin2/src/main/java/ro/fortsoft/pf4j/demo/hello/HelloPlugin.java b/demo_gradle/plugins/plugin2/src/main/java/org/pf4j/demo/hello/HelloPlugin.java index 82c0046..f8e83d3 100644 --- a/demo_gradle/plugins/plugin2/src/main/java/ro/fortsoft/pf4j/demo/hello/HelloPlugin.java +++ b/demo_gradle/plugins/plugin2/src/main/java/org/pf4j/demo/hello/HelloPlugin.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package ro.fortsoft.pf4j.demo.hello; +package org.pf4j.demo.hello; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import ro.fortsoft.pf4j.Extension; -import ro.fortsoft.pf4j.Plugin; -import ro.fortsoft.pf4j.PluginWrapper; -import ro.fortsoft.pf4j.demo.api.Greeting; +import org.pf4j.Extension; +import org.pf4j.Plugin; +import org.pf4j.PluginWrapper; +import org.pf4j.demo.api.Greeting; /** * A very simple plugin. diff --git a/demo_gradle/plugins/plugin3/build.gradle b/demo_gradle/plugins/plugin3/build.gradle index d77258e..7dd77dc 100644 --- a/demo_gradle/plugins/plugin3/build.gradle +++ b/demo_gradle/plugins/plugin3/build.gradle @@ -13,20 +13,20 @@ jar { baseName = 'KotlinPlugin' version = '0.1.0' manifest { - attributes 'Plugin-Class' : 'ro.fortsoft.pf4j.demo.kotlin.KotlinPlugin', - 'Plugin-Id' : 'KotlinPlugin', - 'Plugin-Version' : '1.0.0', - 'Plugin-Provider' : 'Anindya Chatterjee' + attributes 'Plugin-Class': 'org.pf4j.demo.kotlin.KotlinPlugin', + 'Plugin-Id': 'KotlinPlugin', + 'Plugin-Version': '1.0.0', + 'Plugin-Provider': 'Anindya Chatterjee' } } task plugin(type: Jar) { baseName = 'KotlinPlugin' version = '0.1.0' - into('classes'){ + into('classes') { with jar } - into('lib'){ + into('lib') { from configurations.compile } extension('zip') @@ -42,7 +42,7 @@ repositories { dependencies { compileOnly project(':api') - kapt ('ro.fortsoft.pf4j:pf4j:1.3.0') { + kapt('org.pf4j:pf4j:1.4.0-SNAPSHOT') { exclude group: "org.slf4j" } compile 'org.apache.commons:commons-lang3:3.5' diff --git a/demo_gradle/plugins/plugin3/src/main/kotlin/ro/fortsoft/pf4j/demo/kotlin/KotlinPlugin.kt b/demo_gradle/plugins/plugin3/src/main/kotlin/org/pf4j/demo/kotlin/KotlinPlugin.kt index f8df469..2b2bc17 100644 --- a/demo_gradle/plugins/plugin3/src/main/kotlin/ro/fortsoft/pf4j/demo/kotlin/KotlinPlugin.kt +++ b/demo_gradle/plugins/plugin3/src/main/kotlin/org/pf4j/demo/kotlin/KotlinPlugin.kt @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package ro.fortsoft.pf4j.demo.kotlin +package org.pf4j.demo.kotlin import org.apache.commons.lang3.StringUtils import org.slf4j.LoggerFactory -import ro.fortsoft.pf4j.Extension -import ro.fortsoft.pf4j.Plugin -import ro.fortsoft.pf4j.PluginWrapper -import ro.fortsoft.pf4j.demo.api.Greeting +import org.pf4j.Extension +import org.pf4j.Plugin +import org.pf4j.PluginWrapper +import org.pf4j.demo.api.Greeting /** * A sample plugin written in Kotlin diff --git a/demo_gradle/settings.gradle b/demo_gradle/settings.gradle index 8bbcb21..7ee71ba 100644 --- a/demo_gradle/settings.gradle +++ b/demo_gradle/settings.gradle @@ -3,4 +3,3 @@ include 'app' include 'plugins/plugin1' include 'plugins/plugin2' include 'plugins/plugin3' - |