Logging change

cnf/releaserepo/index.xml.sha

@@ -1 +1 @@
-ddb43344d88d2a8f2e84bc741897f6fea91e5883c414bbea102c2b3e124c8de9
+0ab2cdba36f8281971993ac8b98b4a70bb16b86fbde43247bba3b60d6f763d70

pnnl.goss.core/core-api.bnd

@@ -1,4 +1,4 @@
 Export-Package: \
 	com.northconcepts.exception,\
 	pnnl.goss.core
-Bundle-Version: 10.0.7.${tstamp}
+Bundle-Version: 10.0.8.${tstamp}

pnnl.goss.core/goss-client.bnd

@@ -1,3 +1,3 @@
 Private-Package:  \
 	pnnl.goss.core.client
-Bundle-Version: 2.0.176.${tstamp}
+Bundle-Version: 2.0.177.${tstamp}

pnnl.goss.core/goss-core-commands.bnd

@@ -1,3 +1,3 @@
 Private-Package:  \
 	pnnl.goss.core.commands
-Bundle-Version: 2.0.117.${tstamp}
+Bundle-Version: 2.0.118.${tstamp}

pnnl.goss.core/goss-core-security.bnd

@@ -4,4 +4,4 @@ Private-Package:  \
 Bundle-Activator: pnnl.goss.core.security.impl.Activator
 Export-Package:  \
 	pnnl.goss.core.security
-Bundle-Version: 9.0.1.${tstamp}
+Bundle-Version: 9.0.2.${tstamp}

pnnl.goss.core/goss-core-server-api.bnd

@@ -1,3 +1,3 @@
 Export-Package:  \
 	pnnl.goss.core.server
-Bundle-Version: 3.0.135.${tstamp}
+Bundle-Version: 3.0.136.${tstamp}

pnnl.goss.core/goss-core-server-registry.bnd

@@ -1,4 +1,4 @@
-Bundle-Version: 1.0.182.${tstamp}
+Bundle-Version: 1.0.183.${tstamp}
 Private-Package:  \
 	pnnl.goss.server.registry
 DynamicImport-Package: *

pnnl.goss.core/goss-core-server.bnd

@@ -3,4 +3,4 @@ Private-Package:  \
 DynamicImport-Package: *
 #Include-Resource: \
 #	OSGI-INF/blueprint/blueprint.xml=config/blueprint.xml
-Bundle-Version: 2.0.200.${tstamp}
+Bundle-Version: 2.0.201.${tstamp}

pnnl.goss.core/security-jwt.bnd

@@ -1,2 +1,2 @@
 Private-Package: pnnl.goss.core.security.jwt
-Bundle-Version: 1.0.147.${tstamp}
+Bundle-Version: 1.0.148.${tstamp}

pnnl.goss.core/security-ldap.bnd

@@ -1,3 +1,3 @@
 Private-Package:  \
 	pnnl.goss.core.security.ldap
-Bundle-Version: 1.0.132.${tstamp}
+Bundle-Version: 1.0.133.${tstamp}

pnnl.goss.core/security-propertyfile.bnd

@@ -1,3 +1,3 @@
 Private-Package:  \
 	pnnl.goss.core.security.propertyfile
-Bundle-Version: 2.0.143.${tstamp}
+Bundle-Version: 2.0.144.${tstamp}

pnnl.goss.core/security-system.bnd

@@ -1,2 +1,2 @@
 Private-Package: pnnl.goss.core.security.system
-Bundle-Version: 2.0.142.${tstamp}
+Bundle-Version: 2.0.143.${tstamp}

pnnl.goss.core/src/pnnl/goss/core/packageinfo

@@ -1 +1 @@
-version 5.1.0
+version 6.0.0

pnnl.goss.core/src/pnnl/goss/core/security/impl/SecurityConfigImpl.java

@@ -80,7 +80,6 @@ void updated(Dictionary<String, Object> properties) {
 				}
 			}
 
-			System.out.println("SYSTEM CONFIG UPDATED "+managerUser+" "+managerPassword+" "+this);
 
         } else {
         	log.error("No core config properties received by security activator");

pnnl.goss.core/src/pnnl/goss/core/security/impl/SecurityManagerImpl.java

@@ -30,7 +30,6 @@ void updated(Dictionary<String, Object> properties) {
 			String systemManagerPassword = getProperty(PROP_SYSTEM_MANAGER_PASSWORD
 					,null);	
 
-			System.out.println("SYSTEM MANAGER UPDATED "+systemManager);
         	Realm defaultRealm;
 			try {
 				defaultRealm = new SystemRealm(systemManager, systemManagerPassword);

pnnl.goss.core/src/pnnl/goss/core/security/jwt/UnauthTokenBasedRealm.java

@@ -81,19 +81,6 @@ public synchronized void updated(Dictionary<String, ?> properties) throws System
 //			}
 		}
 
-
-		System.out.println("UPDATING UNAUTH REALM");
-//		Set<String> perms = new HashSet<>();
-//		System.out.println("UNATH MANAGER IN SYSTEM REALM "+securityConfig);
-////		SimpleAccount acnt = new SimpleAccount(securityConfig.getManagerUser(), securityConfig.getManagerPassword(), getName() );
-//		SimpleAccount acnt = new SimpleAccount("token", "token", getName() );
-//		acnt.addStringPermission("queue:*");
-//		acnt.addStringPermission("topic:*");
-//		acnt.addStringPermission("temp-queue:*");
-//		acnt.addStringPermission("fusion:*:read");
-//		acnt.addStringPermission("fusion:*:write");
-//		tokenMap.put("token", acnt);
-//		tokenPermissions.put("token", perms);
 	}
 
 	@Start

pnnl.goss.core/src/pnnl/goss/core/security/jwt/UserRepositoryImpl.java

@@ -162,16 +162,13 @@ public void onMessage(Serializable response) {
 			String userId = authArr[0];
 			//validate submitted username and password before generating token
 			if(userMap.containsKey(userId) && authArr[1].equals(userMap.get(userId).getCredentials())){
-				System.out.println("USER MATCHES FOR "+userId);
 				//Create token
 				String token = null;
 				if(tokenMap.containsKey(userId)){
 					token=tokenMap.get(userId);
-					System.out.println("TOKEN ALREADY EXISTS FOR "+userId+"   "+token);
 	        		log.debug("Token already exists for "+userId);
 	        	} else {
 	        		token = securityConfig.createToken(authArr[0], userRoles.get(userId.toString()));
-	        		System.out.println("GENERATED TOKEN FOR "+userId+"    "+token);
 	        		log.debug("Created token for "+userId);
 	        		tokenMap.put(userId, token);
 	        	}
@@ -187,7 +184,6 @@ public void onMessage(Serializable response) {
 
 			client.publish(((DataResponse) response).getReplyDestination(), responseData);
 		} else {
-//			System.out.println("On message: "+response.toString());
 			client.publish("goss/management/response", responseData);
 		}
 	}

pnnl.goss.core/src/pnnl/goss/core/security/packageinfo

@@ -1 +1 @@
-version 5.0.0
+version 7.0.0

pnnl.goss.core/src/pnnl/goss/core/security/system/SystemBasedRealm.java

@@ -64,7 +64,6 @@ protected void onInit() {
 			super.onInit();
 			Set<String> perms = new HashSet<>();
 
-			System.out.println("SECURITY MANAGER IN SYSTEM REALM "+securityConfig);
 			SimpleAccount acnt = new SimpleAccount(securityConfig.getManagerUser(), securityConfig.getManagerPassword(), getName() );
 			acnt.addStringPermission("queue:*,topic:*,temp-queue:*,fusion:*:read,fusion:*:write");
 			perms.add("queue:*,topic:*,temp-queue:*,fusion:*:read,fusion:*:write");
@@ -87,7 +86,6 @@ protected AuthorizationInfo doGetAuthorizationInfo(
 
 		//get the principal this realm cares about:
         String username = (String) getAvailablePrincipal(principals);
-//        System.out.println("SYSTEM GET AUTHZ "+username);
         return userMap.get(username);
 	}