You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jg...@apache.org on 2011/07/09 19:28:03 UTC
svn commit: r1144711 - in /karaf/trunk:
admin/core/src/main/java/org/apache/karaf/admin/internal/
jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/
tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/
Author: jgoodyear
Date: Sat Jul 9 17:28:03 2011
New Revision: 1144711
URL: http://svn.apache.org/viewvc?rev=1144711&view=rev
Log:
[KARAF-720] Make 3.0.x source JDK7 compliant for type handling.
Added explicit casts to String or Set<String> where required.
Modified:
karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/internal/InstanceImpl.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java
karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java
Modified: karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/internal/InstanceImpl.java
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/internal/InstanceImpl.java?rev=1144711&r1=1144710&r2=1144711&view=diff
==============================================================================
--- karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/internal/InstanceImpl.java (original)
+++ karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/internal/InstanceImpl.java Sat Jul 9 17:28:03 2011
@@ -20,6 +20,7 @@ import java.io.*;
import java.net.Socket;
import java.net.URL;
import java.net.UnknownHostException;
+import java.util.Set;
import org.apache.felix.utils.properties.InterpolationHelper;
import org.apache.felix.utils.properties.Properties;
@@ -190,7 +191,7 @@ public class InstanceImpl implements Ins
is = new FileInputStream(configurationFile);
Properties props = new Properties();
props.load(is);
- return props.get(propertyName);
+ return (String) props.get(propertyName);
} catch (Exception e) {
throw e;
} finally {
@@ -317,18 +318,18 @@ public class InstanceImpl implements Ins
props.put("karaf.base", new File(location).getCanonicalPath());
props.put("karaf.home", System.getProperty("karaf.home"));
props.put("karaf.data", new File(new File(location), "data").getCanonicalPath());
- for (String name : props.keySet()) {
+ for (String name : (Set<String>) props.keySet()) {
props.put(name,
- InterpolationHelper.substVars(props.get(name), name, null, props, null));
+ InterpolationHelper.substVars((String) props.get(name), name, null, props, null));
}
String host = "localhost";
if (props.get(KARAF_SHUTDOWN_HOST) != null)
- host = props.get(KARAF_SHUTDOWN_HOST);
+ host = (String) props.get(KARAF_SHUTDOWN_HOST);
String shutdown = DEFAULT_SHUTDOWN_COMMAND;
if (props.get(KARAF_SHUTDOWN_COMMAND) != null)
- shutdown = props.get(KARAF_SHUTDOWN_COMMAND);
+ shutdown = (String) props.get(KARAF_SHUTDOWN_COMMAND);
int port = getShutDownPort(props);
@@ -357,9 +358,9 @@ public class InstanceImpl implements Ins
IOException {
int port = 0;
if (props.get(KARAF_SHUTDOWN_PORT) != null)
- port = Integer.parseInt(props.get(KARAF_SHUTDOWN_PORT));
+ port = Integer.parseInt((String) props.get(KARAF_SHUTDOWN_PORT));
// Try to get port from port file
- String portFile = props.get(KARAF_SHUTDOWN_PORT_FILE);
+ String portFile = (String) props.get(KARAF_SHUTDOWN_PORT_FILE);
if (port == 0 && portFile != null) {
BufferedReader r = new BufferedReader(new InputStreamReader(new FileInputStream(portFile)));
String portStr = r.readLine();
Modified: karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java?rev=1144711&r1=1144710&r2=1144711&view=diff
==============================================================================
--- karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java (original)
+++ karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java Sat Jul 9 17:28:03 2011
@@ -26,6 +26,7 @@ import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.List;
+import java.util.Set;
/**
@@ -69,7 +70,7 @@ public class PropertiesBackingEngine imp
newPassword = encryptionSupport.getEncryption().encryptPassword(password);
}
- String userInfos = users.get(username);
+ String userInfos = (String) users.get(username);
//If user already exists, update password
if (userInfos != null && userInfos.length() > 0) {
@@ -111,7 +112,7 @@ public class PropertiesBackingEngine imp
public List<UserPrincipal> listUsers() {
List<UserPrincipal> result = new ArrayList<UserPrincipal>();
- for (String userNames : users.keySet()) {
+ for (String userNames : (Set<String>) users.keySet()) {
UserPrincipal userPrincipal = new UserPrincipal(userNames);
result.add(userPrincipal);
}
@@ -126,7 +127,7 @@ public class PropertiesBackingEngine imp
*/
public List<RolePrincipal> listRoles(UserPrincipal user) {
List<RolePrincipal> result = new ArrayList<RolePrincipal>();
- String userInfo = users.get(user.getName());
+ String userInfo = (String) users.get(user.getName());
String[] infos = userInfo.split(",");
for (int i = 1; i < infos.length; i++) {
result.add(new RolePrincipal(infos[i]));
@@ -141,7 +142,7 @@ public class PropertiesBackingEngine imp
* @param role
*/
public void addRole(String username, String role) {
- String userInfos = users.get(username);
+ String userInfos = (String) users.get(username);
if (userInfos != null) {
String newUserInfos = userInfos + "," + role;
users.put(username, newUserInfos);
@@ -163,7 +164,7 @@ public class PropertiesBackingEngine imp
String[] infos = null;
StringBuffer userInfoBuffer = new StringBuffer();
- String userInfos = users.get(username);
+ String userInfos = (String) users.get(username);
//If user already exists, remove the role
if (userInfos != null && userInfos.length() > 0) {
Modified: karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java?rev=1144711&r1=1144710&r2=1144711&view=diff
==============================================================================
--- karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java (original)
+++ karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java Sat Jul 9 17:28:03 2011
@@ -90,7 +90,7 @@ public class PropertiesLoginModule exten
String userInfos = null;
try {
- userInfos = users.get(user);
+ userInfos = (String) users.get(user);
} catch (NullPointerException e) {
//error handled in the next statement
}
Modified: karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java?rev=1144711&r1=1144710&r2=1144711&view=diff
==============================================================================
--- karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java (original)
+++ karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java Sat Jul 9 17:28:03 2011
@@ -65,7 +65,7 @@ import org.sonatype.aether.util.artifact
/**
* Installs kar dependencies into a server-under-construction in target/assembly
*
- * @version $Revision: 1.1 $
+ * @version $Revision$
* @goal install-kars
* @phase process-resources
* @requiresDependencyResolution runtime
@@ -248,7 +248,7 @@ public class InstallKarsMojo extends Moj
}
//install bundles listed in startup properties that weren't in kars into the system dir
- for (String key: startupProperties.keySet()) {
+ for (String key: (Set<String>) startupProperties.keySet()) {
String path = MvnUrlUtil.pathFromMaven(key);
File target = new File(system.resolve(path));
if (!target.exists()) {
@@ -351,7 +351,7 @@ public class InstallKarsMojo extends Moj
} finally {
in.close();
}
- String existingFeatureRepos = properties.containsKey(FEATURES_REPOSITORIES) && !properties.get(FEATURES_REPOSITORIES).isEmpty()? properties.get(FEATURES_REPOSITORIES) + ",": "";
+ String existingFeatureRepos = properties.containsKey(FEATURES_REPOSITORIES) && !((String) properties.get(FEATURES_REPOSITORIES)).isEmpty()? properties.get(FEATURES_REPOSITORIES) + ",": "";
existingFeatureRepos = existingFeatureRepos + uri.toString();
properties.put(FEATURES_REPOSITORIES, existingFeatureRepos);
Features repo = readFeatures(uri);
@@ -360,7 +360,7 @@ public class InstallKarsMojo extends Moj
installFeature(feature, null);
} else if (bootFeatures != null && bootFeatures.contains(feature.getName())) {
localRepoFeatures.add(feature);
- String existingBootFeatures = properties.containsKey(FEATURES_BOOT) && !properties.get(FEATURES_BOOT).isEmpty()? properties.get(FEATURES_BOOT) + ",": "";
+ String existingBootFeatures = properties.containsKey(FEATURES_BOOT) && !((String) properties.get(FEATURES_BOOT)).isEmpty()? properties.get(FEATURES_BOOT) + ",": "";
existingBootFeatures = existingBootFeatures + feature.getName();
properties.put(FEATURES_BOOT, existingBootFeatures);
} else if (installedFeatures != null && installedFeatures.contains(feature.getName())) {
@@ -426,7 +426,7 @@ public class InstallKarsMojo extends Moj
String location = bundle.getLocation();
String startLevel = Integer.toString(bundle.getStartLevel() == 0? defaultStartLevel: bundle.getStartLevel());
if (startupProperties.containsKey(location)) {
- int oldStartLevel = Integer.decode(startupProperties.get(location));
+ int oldStartLevel = Integer.decode((String) startupProperties.get(location));
if (oldStartLevel > bundle.getStartLevel()) {
startupProperties.put(location, startLevel);
}