closes #18

kevoree · Feb 24, 2011 · 727c77c · 727c77c
1 parent 911d699
commit 727c77c
Show file tree

Hide file tree

Showing 10 changed files with 256 additions and 25 deletions.
diff --git a/...ree-core/org.kevoree.core/src/main/scala/org/kevoree/core/impl/KevoreeCoreActivator.scala b/...ree-core/org.kevoree.core/src/main/scala/org/kevoree/core/impl/KevoreeCoreActivator.scala
@@ -38,7 +38,6 @@ class KevoreeCoreActivator extends BundleActivator {
     var configBean = new KevoreeConfigServiceBean
     bc.registerService(classOf[ConfigurationService].getName(), configBean, new Hashtable());
 
-
     myBean = new KevoreeCoreBean
     myBean.setBundleContext(bc)
     myBean.setConfigService(configBean)
@@ -62,7 +61,6 @@ class KevoreeCoreActivator extends BundleActivator {
         /* EXPOSE MODELHELPER SERVICES */
         bc.registerService(classOf[MetricsService].getName(), KevoreeMetricsServiceBean(myBean), new Hashtable());
 
-
 
       }
     }.start

diff --git a/kevoree-core/org.kevoree.root/pom.xml b/kevoree-core/org.kevoree.root/pom.xml
@@ -121,8 +121,8 @@
             <url>http://scala-tools.org/repo-releases</url>
         </repository>
         <repository>
-            <id>kevoree-github</id>
-            <url>http://dukeboard.github.com/kevoree/maven/</url>
+            <id>kevoree-libs-release-local</id>
+            <url>http://maven.kevoree.org/libs-release-local/</url>
         </repository>
     </repositories>
 
@@ -152,6 +152,7 @@
         <module>../org.kevoree.baseChecker</module>
     </modules>
 
+<!--
     <distributionManagement>
         <repository>
             <id>embedded-repo</id>
@@ -164,5 +165,15 @@
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
     </distributionManagement>
+-->
+
+<distributionManagement>
+    <repository>
+        <id>maven.kevoree.org-releases</id>
+        <name>maven.kevoree.org-releases</name>
+        <url>http://maven.kevoree.org/libs-release-local</url>
+    </repository>
+</distributionManagement>
+
 
 </project>
diff --git a/kevoree-platform/org.kevoree.platform.osgi.android/seed.txt b/kevoree-platform/org.kevoree.platform.osgi.android/seed.txt
diff --git a/...form.osgi.android/src/main/java/org/kevoree/platform/osgi/android/BootstrapActivator.java b/...form.osgi.android/src/main/java/org/kevoree/platform/osgi/android/BootstrapActivator.java
@@ -23,14 +23,14 @@
 import org.kevoree.api.service.adaptation.deploy.KevoreeAdaptationDeployService;
 import org.kevoree.api.service.core.handler.KevoreeModelHandlerService;
 import org.kevoree.api.service.core.kompare.ModelKompareService;
-import org.kevoree.core.impl.KevoreeConfigServiceBean;
 import org.kevoree.core.impl.KevoreeCoreBean;
 import org.kevoree.kompare.KevoreeKompareBean;
 import org.kevoree.remote.rest.Handler;
 import org.kevoree.remote.rest.KevoreeRemoteBean;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.packageadmin.PackageAdmin;
+import org.kevoree.api.configuration.ConfigConstants;
 
 /**
  *
@@ -58,7 +58,9 @@ public void start(BundleContext context) throws Exception {
 
         deployBean.setContext(contextDeploy);
 
-        KevoreeConfigServiceBean configBean = new KevoreeConfigServiceBean();
+        KevoreeAndroidConfigService configBean = new KevoreeAndroidConfigService();//new KevoreeConfigServiceBean();
+         configBean.def.put("node.name", KevoreeActivity.nodeName);
+
         coreBean = new KevoreeCoreBean();
         coreBean.setBundleContext(context);
         coreBean.setConfigService((ConfigurationService) configBean);

diff --git a/....platform.osgi.android/src/main/java/org/kevoree/platform/osgi/android/EmbeddedFelix.java b/....platform.osgi.android/src/main/java/org/kevoree/platform/osgi/android/EmbeddedFelix.java
@@ -33,6 +33,8 @@ public class EmbeddedFelix {
 
     private Felix m_fwk;
 
+    public static String node_name = "KEVOREEDefaultNodeName";
+
     public Felix getM_fwk() {
         return m_fwk;
     }
@@ -45,12 +47,14 @@ public void run() {
             System.out.println("Init Felix Default path => " + felix_base);
         }
 
+        /*
         String node_name = System.getProperty("node.name");
+
         if (node_name == null) {
             node_name = "KEVOREEDefaultNodeName";
-        }
+        }*/
 
-        File cacheDir = new File(felix_base + "/" + "felixCache_" + node_name);
+        File cacheDir = new File(felix_base + "/" + "felixCache_" + KevoreeActivity.nodeName);
         Map<String, Object> configProps = new HashMap<String, Object>();
         if (cacheDir != null) {
             configProps.put(Constants.FRAMEWORK_STORAGE, cacheDir.getAbsolutePath());

diff --git a/...latform.osgi.android/src/main/java/org/kevoree/platform/osgi/android/KevoreeActivity.java b/...latform.osgi.android/src/main/java/org/kevoree/platform/osgi/android/KevoreeActivity.java
@@ -17,25 +17,24 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.util.Log;
 import android.view.View;
-import android.widget.Button;
-import android.widget.FrameLayout;
-import android.widget.LinearLayout;
-import android.widget.TabHost;
+import android.widget.*;
 import android.widget.TabHost.TabSpec;
-import android.widget.TabWidget;
 import org.kevoree.android.framework.service.KevoreeAndroidService;
 import org.kevoree.platform.osgi.android.ui.PreExistingViewFactory;
 
 /**
  * Hello world!
- *
  */
 public class KevoreeActivity extends Activity implements KevoreeAndroidService {
 
     public static KevoreeAndroidService last = null;
 
+    public static String nodeName = "";
+
     @Override
     protected void onStart() {
         super.onStart();
@@ -49,6 +48,7 @@ protected void onStop() {
         // Intent intent = new Intent(".AndroidFelixService.ACTION");
         //stopService(intent);
     }
+
     private Boolean alreadyStarted = false;
     private TabHost tabs = null;
 
@@ -76,11 +76,18 @@ protected synchronized void onCreate(Bundle savedInstanceState) {
         tspec1.setIndicator("Admin", this.getResources().getDrawable(android.R.drawable.ic_menu_preferences));
 
         LinearLayout adminLayout = new LinearLayout(this);
+
+
+        final EditText nodeNameView = new EditText(this);
+        nodeNameView.setText("dukeTab");
+        nodeNameView.setWidth(200);
+
         Button btstart = new Button(this);
         btstart.setText("Start");
         Button btstop = new Button(this);
         btstop.setText("Stop");
 
+        adminLayout.addView(nodeNameView);
         adminLayout.addView(btstart);
         adminLayout.addView(btstop);
 
@@ -90,6 +97,7 @@ protected synchronized void onCreate(Bundle savedInstanceState) {
         TabSpec tspec2 = tabs.newTabSpec("Tab2");
         tspec2.setIndicator("Two", this.getResources().getDrawable(android.R.drawable.star_on));
         tspec2.setContent(new PreExistingViewFactory(content2));
+
         tabs.addTab(tspec2);
         TabSpec tspec3 = tabs.newTabSpec("Tab3");
         tspec3.setIndicator("Three", this.getResources().getDrawable(android.R.drawable.star_on));
@@ -111,6 +119,7 @@ public void onClick(View v) {
                 Intent intent_start = new Intent(ctx, AndroidFelixService.class);
                 Log.i("art2.service", "start bind service");
                 if (!alreadyStarted) {
+                    nodeName=  nodeNameView.getText().toString();
                     startService(intent_start);
                     alreadyStarted = true;
                 }

diff --git a/....android/src/main/java/org/kevoree/platform/osgi/android/KevoreeAndroidConfigService.java b/....android/src/main/java/org/kevoree/platform/osgi/android/KevoreeAndroidConfigService.java
@@ -0,0 +1,33 @@
+/**
+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE, Version 3, 29 June 2007;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * 	http://www.gnu.org/licenses/lgpl-3.0.txt
+ *
+ * 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 org.kevoree.platform.osgi.android;
+
+import org.kevoree.api.configuration.ConfigConstants;
+import org.kevoree.api.configuration.ConfigurationService;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class KevoreeAndroidConfigService implements ConfigurationService {
+
+    public Map<String,String> def = new HashMap<String,String>();
+
+    @Override
+    public String getProperty(ConfigConstants.ConfigConstant constant) {
+        if(def.containsKey(constant.getValue())){
+           return def.get(constant.getValue());
+        }
+        return constant.getDefaultValue();
+    }
+}
diff --git a/...sgi.standalone.gui/src/main/java/org/kevoree/platform/osgi/standalone/gui/FelixShell.java b/...sgi.standalone.gui/src/main/java/org/kevoree/platform/osgi/standalone/gui/FelixShell.java
@@ -34,21 +34,25 @@ public class FelixShell extends JPanel {
 
     private static String eol = System.getProperty("line.separator");
 
+    private JScrollPane scrollShell = null;
+
     public FelixShell(final ShellService shell) {
 
         setLayout(new BorderLayout());
         final RichTextArea textArea = new RichTextArea();
+         textArea.setBackground(new Color(57,57,57));
         textArea.setEditable(false);
         textArea.setPreferredSize(new Dimension(500,250));
        // textArea.setRows(15);
        // textArea.setColumns(60);
 
 
         singleton = null;
-        STDwriter = new PrintStream(new TextOutputStream(textArea,Color.GRAY));
+        STDwriter = new PrintStream(new TextOutputStream(textArea,Color.WHITE));
         ERRwriter = new PrintStream(new TextOutputStream(textArea,Color.ORANGE));
 
-        add(new JScrollPane(textArea), BorderLayout.CENTER);
+        scrollShell =  new JScrollPane(textArea);
+        add(scrollShell, BorderLayout.CENTER);
 
         final JTextField input = new JTextField();
 
@@ -59,7 +63,7 @@ public void keyPressed(KeyEvent keyEvent) {
 
                     try {
                        // textArea.append("==>" + input.getText() + eol);
-                        textArea.append(input.getText() + eol, Color.BLUE, Color.white, true);
+                        textArea.append(input.getText() + eol, new Color(87,145,198), Color.white, true);
 
                         shell.executeCommand(input.getText().trim(), STDwriter, ERRwriter);
                         input.setText("");
@@ -94,6 +98,7 @@ public void write(final int i) throws IOException {
                 public void run() {
                     try {
                         _textArea.append(((char) i) + "", _color, Color.white, false);
+                         _textArea.selectAll();
                        // _textArea.append( ((char) i) + "");
                     } catch (Exception e) {
                         e.printStackTrace();

diff --git a/...i.standalone.gui/src/main/java/org/kevoree/platform/osgi/standalone/gui/RichTextArea.java b/...i.standalone.gui/src/main/java/org/kevoree/platform/osgi/standalone/gui/RichTextArea.java
@@ -25,22 +25,21 @@ public class RichTextArea extends JTextPane {
     Document doc;
 
     public RichTextArea() {
-
         style = new SimpleAttributeSet();
-        this.setContentType("text/rtf" );
+        this.setContentType("text/rtf");
         this.setEditorKit(new javax.swing.text.rtf.RTFEditorKit());
         doc = this.getDocument();
     }
 
     public void append(String msg, Color color, Color bgColor, boolean isBold) {
         StyleConstants.setForeground(style, color);
-        StyleConstants.setBackground(style, bgColor);
+       // StyleConstants.setBackground(style, bgColor);
         StyleConstants.setBold(style, isBold);
         int len = doc.getLength();
         try {
- 	doc.insertString(len, msg, style);
+            doc.insertString(len, msg, style);
         } catch (Exception e) {
-            System.out.print("Failed to append msg ["+msg+"]" );
+            System.out.print("Failed to append msg [" + msg + "]");
         }
     }
 

diff --git a/...ols/org.kevoree.tools.ui.framework/src/main/java/org/kevoree/tools/ui/framework/Main.java b/...ols/org.kevoree.tools.ui.framework/src/main/java/org/kevoree/tools/ui/framework/Main.java
@@ -90,6 +90,7 @@ public static void main(String[] args) {
 
 
 
+
         p11.setTitle("P11");
         p12.setTitle("P12");
         p21.setTitle("P21");