save
Showing
7 changed files
with
23 additions
and
17 deletions
| ... | @@ -147,7 +147,7 @@ | ... | @@ -147,7 +147,7 @@ |
| 147 | <dependency> | 147 | <dependency> |
| 148 | <groupId>org.emercit</groupId> | 148 | <groupId>org.emercit</groupId> |
| 149 | <artifactId>utilstools</artifactId> | 149 | <artifactId>utilstools</artifactId> |
| 150 | <version>1.50</version> | 150 | <version>1.87</version> |
| 151 | </dependency> | 151 | </dependency> |
| 152 | 152 | ||
| 153 | <dependency> | 153 | <dependency> | ... | ... |
| ... | @@ -3,7 +3,7 @@ | ... | @@ -3,7 +3,7 @@ |
| 3 | <groupId>org.emercit</groupId> | 3 | <groupId>org.emercit</groupId> |
| 4 | <artifactId>utilstools</artifactId> | 4 | <artifactId>utilstools</artifactId> |
| 5 | <versioning> | 5 | <versioning> |
| 6 | <release>1.50</release> | 6 | <release>1.87</release> |
| 7 | <versions> | 7 | <versions> |
| 8 | <version>1.0</version> | 8 | <version>1.0</version> |
| 9 | <version>1.1</version> | 9 | <version>1.1</version> |
| ... | @@ -51,7 +51,9 @@ | ... | @@ -51,7 +51,9 @@ |
| 51 | <version>1.45</version> | 51 | <version>1.45</version> |
| 52 | <version>1.46</version> | 52 | <version>1.46</version> |
| 53 | <version>1.50</version> | 53 | <version>1.50</version> |
| 54 | <version>1.85</version> | ||
| 55 | <version>1.87</version> | ||
| 54 | </versions> | 56 | </versions> |
| 55 | <lastUpdated>20150812065914</lastUpdated> | 57 | <lastUpdated>20151002125315</lastUpdated> |
| 56 | </versioning> | 58 | </versioning> |
| 57 | </metadata> | 59 | </metadata> | ... | ... |
| ... | @@ -67,7 +67,7 @@ | ... | @@ -67,7 +67,7 @@ |
| 67 | <dependency> | 67 | <dependency> |
| 68 | <groupId>org.emercit</groupId> | 68 | <groupId>org.emercit</groupId> |
| 69 | <artifactId>utilstools</artifactId> | 69 | <artifactId>utilstools</artifactId> |
| 70 | <version>1.50</version> | 70 | <version>1.85</version> |
| 71 | </dependency> | 71 | </dependency> |
| 72 | 72 | ||
| 73 | 73 | ... | ... |
| ... | @@ -147,7 +147,7 @@ public class EthLinux implements IEth { | ... | @@ -147,7 +147,7 @@ public class EthLinux implements IEth { |
| 147 | 147 | ||
| 148 | } | 148 | } |
| 149 | 149 | ||
| 150 | private int Config(Vector<EthBean> ebs) { | 150 | public int Config(Vector<EthBean> ebs1) { |
| 151 | 151 | ||
| 152 | try { | 152 | try { |
| 153 | File file = new File("/etc/network/interfaces"); | 153 | File file = new File("/etc/network/interfaces"); |
| ... | @@ -166,7 +166,7 @@ public class EthLinux implements IEth { | ... | @@ -166,7 +166,7 @@ public class EthLinux implements IEth { |
| 166 | bw.write("\n"); | 166 | bw.write("\n"); |
| 167 | bw.write("\n"); | 167 | bw.write("\n"); |
| 168 | 168 | ||
| 169 | for (EthBean eb:ebs) { | 169 | for (EthBean eb:ebs1) { |
| 170 | 170 | ||
| 171 | if (!eb.getDhcp()) { | 171 | if (!eb.getDhcp()) { |
| 172 | 172 | ||
| ... | @@ -214,12 +214,12 @@ public class EthLinux implements IEth { | ... | @@ -214,12 +214,12 @@ public class EthLinux implements IEth { |
| 214 | 214 | ||
| 215 | public int setDefaults() { | 215 | public int setDefaults() { |
| 216 | 216 | ||
| 217 | ebs=new Vector<EthBean>(); | 217 | Vector<EthBean> ebsDef=new Vector<EthBean>(); |
| 218 | 218 | ||
| 219 | Vector<String> v=new Vector<String>(); | 219 | Vector<String> v=new Vector<String>(); |
| 220 | v.add(""); | 220 | v.add(""); |
| 221 | if (ebs==null || ebs.size()==0) { | 221 | if (ebsDef==null || ebsDef.size()==0) { |
| 222 | ebs=new Vector<EthBean>(); | 222 | ebsDef=new Vector<EthBean>(); |
| 223 | 223 | ||
| 224 | EthBean NewEb=new EthBean(); | 224 | EthBean NewEb=new EthBean(); |
| 225 | //Eth0 | 225 | //Eth0 |
| ... | @@ -231,8 +231,7 @@ public class EthLinux implements IEth { | ... | @@ -231,8 +231,7 @@ public class EthLinux implements IEth { |
| 231 | NewEb.setGateway(DefSettings.Eth0_gateway); | 231 | NewEb.setGateway(DefSettings.Eth0_gateway); |
| 232 | NewEb.setInfo(v); | 232 | NewEb.setInfo(v); |
| 233 | NewEb.setId(DefSettings.Eth0_id); | 233 | NewEb.setId(DefSettings.Eth0_id); |
| 234 | 234 | ebsDef.add(NewEb); | |
| 235 | ebs.add(NewEb); | ||
| 236 | 235 | ||
| 237 | //Eth1 | 236 | //Eth1 |
| 238 | /* | 237 | /* |
| ... | @@ -252,7 +251,7 @@ public class EthLinux implements IEth { | ... | @@ -252,7 +251,7 @@ public class EthLinux implements IEth { |
| 252 | */ | 251 | */ |
| 253 | 252 | ||
| 254 | } | 253 | } |
| 255 | return Config(ebs); | 254 | return Config(ebsDef); |
| 256 | } | 255 | } |
| 257 | 256 | ||
| 258 | } | 257 | } | ... | ... |
| ... | @@ -70,10 +70,15 @@ public class Settings implements ISettings { | ... | @@ -70,10 +70,15 @@ public class Settings implements ISettings { |
| 70 | 70 | ||
| 71 | gsm.set(model.getGsmbean()); | 71 | gsm.set(model.getGsmbean()); |
| 72 | 72 | ||
| 73 | for (EthBean eb:model.getEthbeans()) { | 73 | //for (EthBean eb:model.getEthbeans()) { |
| 74 | 74 | ||
| 75 | ethlinux.Update(eb); | 75 | //ethlinux.Update(eb); |
| 76 | } | 76 | //} |
| 77 | |||
| 78 | ethlinux.Config(model.getEthbeans()); | ||
| 79 | |||
| 80 | |||
| 81 | |||
| 77 | 82 | ||
| 78 | proxylinux.Config(model.getProxybeans()); | 83 | proxylinux.Config(model.getProxybeans()); |
| 79 | 84 | ... | ... |
-
Please register or sign in to post a comment