karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject git commit: [KARAF-3115] Fix typo mistake in instance:create command and add address arguments to the create operation of the InstanceMBean
Date Tue, 15 Jul 2014 08:22:48 GMT
Repository: karaf
Updated Branches:
  refs/heads/master f703814bf -> cf28f0499


[KARAF-3115] Fix typo mistake in instance:create command and add address arguments to the
create operation of the InstanceMBean

Conflicts:
	instance/src/main/java/org/apache/karaf/instance/core/InstancesMBean.java


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/cf28f049
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/cf28f049
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/cf28f049

Branch: refs/heads/master
Commit: cf28f04997f49925b2fed2643423552bbd44dc8e
Parents: f703814
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Tue Jul 15 10:04:09 2014 +0200
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Tue Jul 15 10:22:36 2014 +0200

----------------------------------------------------------------------
 .../karaf/instance/core/InstancesMBean.java      | 19 ++-----------------
 .../core/internal/InstancesMBeanImpl.java        | 10 +---------
 2 files changed, 3 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/cf28f049/instance/src/main/java/org/apache/karaf/instance/core/InstancesMBean.java
----------------------------------------------------------------------
diff --git a/instance/src/main/java/org/apache/karaf/instance/core/InstancesMBean.java b/instance/src/main/java/org/apache/karaf/instance/core/InstancesMBean.java
index 8faa363..f77c936 100644
--- a/instance/src/main/java/org/apache/karaf/instance/core/InstancesMBean.java
+++ b/instance/src/main/java/org/apache/karaf/instance/core/InstancesMBean.java
@@ -35,23 +35,8 @@ public interface InstancesMBean {
             INSTANCE_RMI_SERVER_PORT, INSTANCE_STATE, INSTANCE_LOCATION, INSTANCE_JAVAOPTS
};
 
     // Operations
-    int createInstance(String name,
-                       int sshPort,
-                       int rmiRegistryPort,
-                       int rmiServerPort,
-                       String location,
-                       String javaOpts,
-                       String features,
-                       String featureURLs) throws MBeanException;
-    int createInstance(String name,
-                       int sshPort,
-                       int rmiRegistryPort,
-                       int rmiServerPort,
-                       String location,
-                       String javaOpts,
-                       String features,
-                       String featureURLs,
-                       String address) throws MBeanException;
+    int createInstance(String name, int sshPort, int rmiRegistryPort, int rmiServerPort,
String location, String javaOpts, String features, String featureURLs) throws MBeanException;
+    int createInstance(String name, int sshPort, int rmiRegistryPort, int rmiServerPort,
String location, String javaOpts, String features, String featureURLs, String address) throws
MBeanException;
     void changeSshPort(String name, int port) throws MBeanException;
     void changeRmiRegistryPort(String name, int port) throws MBeanException;
     void changeRmiServerPort(String name, int port) throws MBeanException;

http://git-wip-us.apache.org/repos/asf/karaf/blob/cf28f049/instance/src/main/java/org/apache/karaf/instance/core/internal/InstancesMBeanImpl.java
----------------------------------------------------------------------
diff --git a/instance/src/main/java/org/apache/karaf/instance/core/internal/InstancesMBeanImpl.java
b/instance/src/main/java/org/apache/karaf/instance/core/internal/InstancesMBeanImpl.java
index 1aaf8b8..97a46d6 100644
--- a/instance/src/main/java/org/apache/karaf/instance/core/internal/InstancesMBeanImpl.java
+++ b/instance/src/main/java/org/apache/karaf/instance/core/internal/InstancesMBeanImpl.java
@@ -53,15 +53,7 @@ public class InstancesMBeanImpl extends StandardMBean implements InstancesMBean
         return this.createInstance(name, sshPort, rmiRegistryPort, rmiServerPort, location,
javaOpts, features, featuresURLs, "localhost");
     }
 
-    public int createInstance(String name,
-                              int sshPort,
-                              int rmiRegistryPort,
-                              int rmiServerPort,
-                              String location,
-                              String javaOpts,
-                              String features,
-                              String featureURLs,
-                              String address)
+    public int createInstance(String name, int sshPort, int rmiRegistryPort, int rmiServerPort,
String location, String javaOpts, String features, String featureURLs, String address)
             throws MBeanException {
         try {
             if ("".equals(location)) {


Mime
View raw message