minor fixes

diff --git a/demo_gradle/.gitignore b/demo_gradle/.gitignore
index 378eac25d311703f3f2cd456d8036da525cd0366..91ea7410d8977ededc4a968849a65b194e570976 100644 (file)
--- a/demo_gradle/.gitignore
+++ b/demo_gradle/.gitignore
@@ -1 +1,2 @@
 build
+.gradle

diff --git a/demo_gradle/app/build.gradle b/demo_gradle/app/build.gradle
index 22145d8bfd8c3503a5fbc39ed2220a7757eb2c49..7532967fba86a181e753251ca49f8c12f0a4a33f 100644 (file)
--- a/demo_gradle/app/build.gradle
+++ b/demo_gradle/app/build.gradle
@@ -1,3 +1,7 @@
+apply plugin:'application'
+
+mainClassName = 'ro.fortsoft.pf4j.demo.Boot'
+
 dependencies {
   compile project(':api')
   compile 'ro.fortsoft.pf4j:pf4j:0.4'

diff --git a/demo_gradle/app/src/main/java/ro/fortsoft/pf4j/demo/Boot.java b/demo_gradle/app/src/main/java/ro/fortsoft/pf4j/demo/Boot.java
index 261953174891a7398834a9de67a001134c5069fe..503e7c0714f8e946e5d87e57df173be91dfdf92b 100644 (file)
--- a/demo_gradle/app/src/main/java/ro/fortsoft/pf4j/demo/Boot.java
+++ b/demo_gradle/app/src/main/java/ro/fortsoft/pf4j/demo/Boot.java
@@ -15,7 +15,7 @@ package ro.fortsoft.pf4j.demo;
 import java.util.List;\r
 import java.util.Set;\r
 \r
-import org.apache.commons.lang.StringUtils;\r
+import org.apache.commons.lang3.StringUtils;\r
 \r
 import ro.fortsoft.pf4j.DefaultPluginManager;\r
 import ro.fortsoft.pf4j.PluginManager;\r
@@ -45,6 +45,9 @@ public class Boot {
         // start (active/resolved) the plugins\r
         pluginManager.startPlugins();\r
 \r
+        System.out.println("Plugindirectory: ");\r
+        System.out.println("\t" + System.getProperty("pf4j.pluginsDir", "plugins") + "\n");\r
+\r
         // retrieves the extensions for Greeting extension point\r
         List<Greeting> greetings = pluginManager.getExtensions(Greeting.class);\r
         System.out.println(String.format("Found %d extensions for extension point '%s'", greetings.size(), Greeting.class.getName()));\r
@@ -52,22 +55,22 @@ public class Boot {
             System.out.println(">>> " + greeting.getGreeting());\r
         }\r
 \r
-        // print extensions from classpath (non plugin)\r
-        System.out.println(String.format("Extensions added by classpath:"));\r
-        Set<String> extensionClassNames = pluginManager.getExtensionClassNames(null);\r
-        for (String extension : extensionClassNames) {\r
-            System.out.println("   " + extension);\r
-        }\r
+        // // print extensions from classpath (non plugin)\r
+        // System.out.println(String.format("Extensions added by classpath:"));\r
+        // Set<String> extensionClassNames = pluginManager.getExtensionClassNames(null);\r
+        // for (String extension : extensionClassNames) {\r
+        //     System.out.println("   " + extension);\r
+        // }\r
 \r
         // print extensions for each started plugin\r
         List<PluginWrapper> startedPlugins = pluginManager.getStartedPlugins();\r
         for (PluginWrapper plugin : startedPlugins) {\r
             String pluginId = plugin.getDescriptor().getPluginId();\r
             System.out.println(String.format("Extensions added by plugin '%s':", pluginId));\r
-            extensionClassNames = pluginManager.getExtensionClassNames(pluginId);\r
-            for (String extension : extensionClassNames) {\r
-                System.out.println("   " + extension);\r
-            }\r
+            // extensionClassNames = pluginManager.getExtensionClassNames(pluginId);\r
+            // for (String extension : extensionClassNames) {\r
+            //     System.out.println("   " + extension);\r
+            // }\r
         }\r
 \r
         // stop the plugins\r

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/ro/fortsoft/pf4j/demo/welcome/WelcomePlugin.java
index 1c3525905255b3aea9c6bed7975fec487ff5e2aa..824180c3183794288fcef26ec02aebe967bffd72 100644 (file)
--- a/demo_gradle/plugins/plugin1/src/main/java/ro/fortsoft/pf4j/demo/welcome/WelcomePlugin.java
+++ b/demo_gradle/plugins/plugin1/src/main/java/ro/fortsoft/pf4j/demo/welcome/WelcomePlugin.java
@@ -1,23 +1,22 @@
 /*
  * Copyright 2012 Decebal Suiu
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this work except in compliance with
  * the License. You may obtain a copy of the License in the LICENSE file, or at:
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
 package ro.fortsoft.pf4j.demo.welcome;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import ro.fortsoft.pf4j.Extension;
 import ro.fortsoft.pf4j.Plugin;
 import ro.fortsoft.pf4j.PluginWrapper;
-import ro.fortsoft.pf4j.RuntimeMode;
 import ro.fortsoft.pf4j.demo.api.Greeting;
 
 /**
@@ -32,10 +31,7 @@ public class WelcomePlugin extends Plugin {
     @Override
     public void start() {
         System.out.println("WelcomePlugin.start()");
-        // for testing the development mode
-        if (RuntimeMode.DEVELOPMENT.equals(wrapper.getRuntimeMode())) {
                System.out.println(StringUtils.upperCase("WelcomePlugin"));
-        }
     }
 
     @Override

diff --git a/demo_gradle/settings.gradle b/demo_gradle/settings.gradle
index 01be4bd23cb4dc5448a75b4715c542cb83804fe7..e76ea04b408dd5afdb3fc5533ca009ee817a5385 100644 (file)
--- a/demo_gradle/settings.gradle
+++ b/demo_gradle/settings.gradle
@@ -1,3 +1,4 @@
 include 'api'
 include 'app'
-include 'plugins'
\ No newline at end of file
+include 'plugins/plugin1'
+include 'plugins/plugin2'
\ No newline at end of file