Author: jbonofre
Date: Mon Jul 25 21:11:46 2011
New Revision: 1150913
URL: http://svn.apache.org/viewvc?rev=1150913&view=rev
Log:
Apply Apache source style policy (remove @author tag, add license section in
the POM, etc).
Modified:
karaf/trunk/archetypes/itests/src/test/java/org/apache/karaf/archetypes/CommandArchetypeTest.java
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/CancelCommand.java
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/JaasCommandSupport.java
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListPendingCommand.java
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListRealmsCommand.java
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListUsersCommand.java
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/ManageRealmCommand.java
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/RoleAddCommand.java
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/RoleDeleteCommand.java
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/UpdateCommand.java
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/UserAddCommand.java
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/UserDeleteCommand.java
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/completers/RealmCompleter.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/AbstractKarafLoginModule.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/BackingEngine.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/BackingEngineFactory.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/BackingEngineService.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/Encryption.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/EncryptionService.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/GroupPrincipal.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/RolePolicy.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/RolePrincipal.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/UserPrincipal.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/encryption/BasicEncryption.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/encryption/BasicEncryptionService.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/encryption/EncryptionSupport.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCBackingEngine.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCBackingEngineFactory.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCLoginModule.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCUtils.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.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/PropertiesBackingEngineFactory.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesConverter.java
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java
karaf/trunk/scheduler/core/src/main/java/org/apache/karaf/scheduler/core/Activator.java
karaf/trunk/scheduler/core/src/main/java/org/apache/karaf/scheduler/core/KarafTimerTask.java
karaf/trunk/scheduler/core/src/main/java/org/apache/karaf/scheduler/core/RunableServiceListener.java
karaf/trunk/scheduler/core/src/main/java/org/apache/karaf/scheduler/core/TaskScheduler.java
karaf/trunk/scheduler/pom.xml
karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/info/InfoProvider.java
Modified:
karaf/trunk/archetypes/itests/src/test/java/org/apache/karaf/archetypes/CommandArchetypeTest.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/archetypes/itests/src/test/java/org/apache/karaf/archetypes/CommandArchetypeTest.java?rev=1150913&r1=1150912&r2=1150913&view=diff
==============================================================================
---
karaf/trunk/archetypes/itests/src/test/java/org/apache/karaf/archetypes/CommandArchetypeTest.java
(original)
+++
karaf/trunk/archetypes/itests/src/test/java/org/apache/karaf/archetypes/CommandArchetypeTest.java
Mon Jul 25 21:11:46 2011
@@ -18,10 +18,6 @@ package org.apache.karaf.archetypes;
import java.util.Properties;
-/**
- *
- * @author iocanel
- */
public class CommandArchetypeTest extends AbstractArchetypeTest {
public void testCommand() throws Exception {
@@ -31,4 +27,5 @@ public class CommandArchetypeTest extend
commandArchetypeParameters.setProperty("description",
"testdescription");
testKarafArchetype("archetypes-command", commandArchetypeParameters);
}
+
}
Modified:
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/CancelCommand.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/CancelCommand.java?rev=1150913&r1=1150912&r2=1150913&view=diff
==============================================================================
---
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/CancelCommand.java
(original)
+++
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/CancelCommand.java
Mon Jul 25 21:11:46 2011
@@ -21,9 +21,6 @@ import org.apache.karaf.jaas.modules.Bac
import java.util.LinkedList;
-/**
- * @author iocanel
- */
@Command(scope = "jaas", name = "cancel", description = "Cancel the
modification of a JAAS realm.")
public class CancelCommand extends JaasCommandSupport {
@@ -40,4 +37,5 @@ public class CancelCommand extends JaasC
protected Object doExecute(BackingEngine engine) throws Exception {
return null;
}
+
}
Modified:
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/JaasCommandSupport.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/JaasCommandSupport.java?rev=1150913&r1=1150912&r2=1150913&view=diff
==============================================================================
---
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/JaasCommandSupport.java
(original)
+++
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/JaasCommandSupport.java
Mon Jul 25 21:11:46 2011
@@ -25,9 +25,6 @@ import javax.security.auth.login.AppConf
import java.util.List;
import java.util.Queue;
-/**
- * @author iocanel
- */
public abstract class JaasCommandSupport extends OsgiCommandSupport {
public static final String JAAS_REALM = "JaasCommand.REALM";
@@ -106,7 +103,6 @@ public abstract class JaasCommandSupport
return appConfigurationEntry;
}
-
public List<JaasRealm> getRealms() {
return realms;
}
@@ -122,4 +118,5 @@ public abstract class JaasCommandSupport
public void setBackingEngineService(BackingEngineService
backingEngineService) {
this.backingEngineService = backingEngineService;
}
+
}
Modified:
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListPendingCommand.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListPendingCommand.java?rev=1150913&r1=1150912&r2=1150913&view=diff
==============================================================================
---
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListPendingCommand.java
(original)
+++
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListPendingCommand.java
Mon Jul 25 21:11:46 2011
@@ -9,13 +9,7 @@ import javax.security.auth.login.AppConf
import java.util.Queue;
/**
- * @author iocanel
- */
-
-/**
* Lists the commands the are in the command queue, for the active
realm/module.
- *
- * @author iocanel
*/
@Command(scope = "jaas", name = "pending", description = "Lists the
modification on the active realm/module.")
public class ListPendingCommand extends JaasCommandSupport {
Modified:
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListRealmsCommand.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListRealmsCommand.java?rev=1150913&r1=1150912&r2=1150913&view=diff
==============================================================================
---
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListRealmsCommand.java
(original)
+++
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListRealmsCommand.java
Mon Jul 25 21:11:46 2011
@@ -8,9 +8,6 @@ import org.apache.karaf.jaas.modules.Bac
import javax.security.auth.login.AppConfigurationEntry;
import java.util.List;
-/**
- * @author iocanel
- */
@Command(scope = "jaas", name = "list", description = "Lists the modification
on the active realm/module.")
public class ListRealmsCommand extends JaasCommandSupport {
Modified:
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListUsersCommand.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListUsersCommand.java?rev=1150913&r1=1150912&r2=1150913&view=diff
==============================================================================
---
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListUsersCommand.java
(original)
+++
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListUsersCommand.java
Mon Jul 25 21:11:46 2011
@@ -9,9 +9,6 @@ import org.apache.karaf.jaas.modules.Use
import javax.security.auth.login.AppConfigurationEntry;
import java.util.List;
-/**
- * @author iocanel
- */
@Command(scope = "jaas", name = "userlist", description = "Lists the users of
the active realm/module.")
public class ListUsersCommand extends JaasCommandSupport {
@@ -58,4 +55,5 @@ public class ListUsersCommand extends Ja
}
return null;
}
+
}
Modified:
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/ManageRealmCommand.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/ManageRealmCommand.java?rev=1150913&r1=1150912&r2=1150913&view=diff
==============================================================================
---
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/ManageRealmCommand.java
(original)
+++
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/ManageRealmCommand.java
Mon Jul 25 21:11:46 2011
@@ -26,9 +26,6 @@ import javax.security.auth.login.AppConf
import java.util.LinkedList;
import java.util.Queue;
-/**
- * @author iocanel
- */
@Command(scope = "jaas", name = "manage", description = "Manage user and roles
of a Jaas Realm.")
public class ManageRealmCommand extends JaasCommandSupport {
@@ -83,4 +80,5 @@ public class ManageRealmCommand extends
protected Object doExecute(BackingEngine engine) throws Exception {
return null;
}
+
}
Modified:
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/RoleAddCommand.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/RoleAddCommand.java?rev=1150913&r1=1150912&r2=1150913&view=diff
==============================================================================
---
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/RoleAddCommand.java
(original)
+++
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/RoleAddCommand.java
Mon Jul 25 21:11:46 2011
@@ -22,8 +22,6 @@ import org.apache.karaf.jaas.modules.Bac
/**
* Adds a role to a user of the active realm/module.
- *
- * @author iocanel
*/
@Command(scope = "jaas", name = "roleadd", description = "Add a role to a
user.")
public class RoleAddCommand extends JaasCommandSupport {
@@ -70,4 +68,5 @@ public class RoleAddCommand extends Jaas
", role='" + role + '\'' +
'}';
}
+
}
Modified:
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/RoleDeleteCommand.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/RoleDeleteCommand.java?rev=1150913&r1=1150912&r2=1150913&view=diff
==============================================================================
---
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/RoleDeleteCommand.java
(original)
+++
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/RoleDeleteCommand.java
Mon Jul 25 21:11:46 2011
@@ -22,8 +22,6 @@ import org.apache.karaf.jaas.modules.Bac
/**
* Deletes a role from a user of the active realm/module.
- *
- * @author iocanel
*/
@Command(scope = "jaas", name = "roledel", description = "Delete a role from a
user.")
public class RoleDeleteCommand extends JaasCommandSupport {
@@ -70,4 +68,5 @@ public class RoleDeleteCommand extends J
", role='" + role + '\'' +
'}';
}
+
}
Modified:
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/UpdateCommand.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/UpdateCommand.java?rev=1150913&r1=1150912&r2=1150913&view=diff
==============================================================================
---
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/UpdateCommand.java
(original)
+++
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/UpdateCommand.java
Mon Jul 25 21:11:46 2011
@@ -26,8 +26,6 @@ import java.util.Queue;
/**
* Executes all the pending commands of the active realm/module.
- *
- * @author iocanel
*/
@Command(scope = "jaas", name = "update", description = "Update JAAS realm.")
public class UpdateCommand extends JaasCommandSupport {
@@ -74,4 +72,5 @@ public class UpdateCommand extends JaasC
session.put(JAAS_CMDS, new LinkedList<JaasCommandSupport>());
return null;
}
+
}
Modified:
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/UserAddCommand.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/UserAddCommand.java?rev=1150913&r1=1150912&r2=1150913&view=diff
==============================================================================
---
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/UserAddCommand.java
(original)
+++
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/UserAddCommand.java
Mon Jul 25 21:11:46 2011
@@ -22,8 +22,6 @@ import org.apache.karaf.jaas.modules.Bac
/**
* Creates a new user in the active realm/module.
- *
- * @author iocanel
*/
@Command(scope = "jaas", name = "useradd", description = "Add a user.")
public class UserAddCommand extends JaasCommandSupport {
@@ -71,4 +69,5 @@ public class UserAddCommand extends Jaas
", password='" + password + '\'' +
'}';
}
+
}
Modified:
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/UserDeleteCommand.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/UserDeleteCommand.java?rev=1150913&r1=1150912&r2=1150913&view=diff
==============================================================================
---
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/UserDeleteCommand.java
(original)
+++
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/UserDeleteCommand.java
Mon Jul 25 21:11:46 2011
@@ -22,8 +22,6 @@ import org.apache.karaf.jaas.modules.Bac
/**
* Deletes a user of the active realm/module.
- *
- * @author iocanel
*/
@Command(scope = "jaas", name = "userdel", description = "Delete a user.")
public class UserDeleteCommand extends JaasCommandSupport {
@@ -44,7 +42,6 @@ public class UserDeleteCommand extends J
return null;
}
-
public String getUsername() {
return username;
}
@@ -59,4 +56,5 @@ public class UserDeleteCommand extends J
"username='" + username + '\'' +
'}';
}
+
}
Modified:
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/completers/RealmCompleter.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/completers/RealmCompleter.java?rev=1150913&r1=1150912&r2=1150913&view=diff
==============================================================================
---
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/completers/RealmCompleter.java
(original)
+++
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/completers/RealmCompleter.java
Mon Jul 25 21:11:46 2011
@@ -6,9 +6,6 @@ import org.apache.karaf.shell.console.co
import java.util.List;
-/**
- * @author: iocanel
- */
public class RealmCompleter implements Completer {
private final StringsCompleter delegate = new StringsCompleter();
@@ -35,4 +32,5 @@ public class RealmCompleter implements C
public void setRealms(List<JaasRealm> realms) {
this.realms = realms;
}
+
}
Modified:
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/AbstractKarafLoginModule.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/AbstractKarafLoginModule.java?rev=1150913&r1=1150912&r2=1150913&view=diff
==============================================================================
---
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/AbstractKarafLoginModule.java
(original)
+++
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/AbstractKarafLoginModule.java
Mon Jul 25 21:11:46 2011
@@ -28,11 +28,7 @@ import java.util.Set;
/**
- * <p>
* Abstract JAAS login module extended by all Karaf Login Modules.
- * </p>
- *
- * @author iocanel, jbonofre
*/
public abstract class AbstractKarafLoginModule implements LoginModule {
Modified:
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/BackingEngine.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/BackingEngine.java?rev=1150913&r1=1150912&r2=1150913&view=diff
==============================================================================
---
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/BackingEngine.java
(original)
+++
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/BackingEngine.java
Mon Jul 25 21:11:46 2011
@@ -16,9 +16,6 @@ package org.apache.karaf.jaas.modules;
import java.util.List;
-/**
- * @author iocanel
- */
public interface BackingEngine {
Modified:
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/BackingEngineFactory.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/BackingEngineFactory.java?rev=1150913&r1=1150912&r2=1150913&view=diff
==============================================================================
---
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/BackingEngineFactory.java
(original)
+++
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/BackingEngineFactory.java
Mon Jul 25 21:11:46 2011
@@ -17,9 +17,6 @@ package org.apache.karaf.jaas.modules;
import java.util.Map;
-/**
- * @author iocanel
- */
public interface BackingEngineFactory {
/**
@@ -37,4 +34,5 @@ public interface BackingEngineFactory {
* @return
*/
BackingEngine build(Map options);
+
}
Modified:
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/BackingEngineService.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/BackingEngineService.java?rev=1150913&r1=1150912&r2=1150913&view=diff
==============================================================================
---
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/BackingEngineService.java
(original)
+++
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/BackingEngineService.java
Mon Jul 25 21:11:46 2011
@@ -21,9 +21,6 @@ import org.apache.karaf.jaas.boot.ProxyL
import javax.security.auth.login.AppConfigurationEntry;
import java.util.List;
-/**
- * @author iocanel
- */
public class BackingEngineService {
private List<BackingEngineFactory> engineFactories;
@@ -48,4 +45,5 @@ public class BackingEngineService {
public void setEngineFactories(List<BackingEngineFactory> engineFactories)
{
this.engineFactories = engineFactories;
}
+
}
Modified:
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/Encryption.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/Encryption.java?rev=1150913&r1=1150912&r2=1150913&view=diff
==============================================================================
---
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/Encryption.java
(original)
+++
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/Encryption.java
Mon Jul 25 21:11:46 2011
@@ -15,18 +15,12 @@
package org.apache.karaf.jaas.modules;
/**
- * <p>
* Interface describing the password encryption service.
- * </>
- *
- * @author jbonofre
*/
public interface Encryption {
/**
- * <p>
* Encrypt a password.
- * </p>
*
* @param plain the password in plain format.
* @return the encrypted password format.
@@ -34,9 +28,7 @@ public interface Encryption {
public String encryptPassword(String plain);
/**
- * <p>
* Check password.
- * </p>
*
* @param input password provided in plain format.
* @param password the encrypted format to compare with.
Modified:
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/EncryptionService.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/EncryptionService.java?rev=1150913&r1=1150912&r2=1150913&view=diff
==============================================================================
---
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/EncryptionService.java
(original)
+++
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/EncryptionService.java
Mon Jul 25 21:11:46 2011
@@ -16,8 +16,6 @@ package org.apache.karaf.jaas.modules;
import java.util.Map;
-/**
- */
public interface EncryptionService {
String ALGORITHM = "algorithm";
Modified:
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/GroupPrincipal.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/GroupPrincipal.java?rev=1150913&r1=1150912&r2=1150913&view=diff
==============================================================================
---
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/GroupPrincipal.java
(original)
+++
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/GroupPrincipal.java
Mon Jul 25 21:11:46 2011
@@ -20,10 +20,6 @@ import java.security.acl.Group;
import java.util.Enumeration;
import java.util.Hashtable;
-/**
- *
- * @author iocanel
- */
public class GroupPrincipal implements Group {
private String name;
@@ -54,4 +50,5 @@ public class GroupPrincipal implements G
public String getName() {
return name;
}
+
}
Modified:
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/RolePolicy.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/RolePolicy.java?rev=1150913&r1=1150912&r2=1150913&view=diff
==============================================================================
---
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/RolePolicy.java
(original)
+++
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/RolePolicy.java
Mon Jul 25 21:11:46 2011
@@ -23,10 +23,6 @@ import java.util.Map;
import java.util.Set;
import javax.security.auth.Subject;
-/**
- *
- * @author iocanel
- */
public enum RolePolicy {
PREFIXED_ROLES("prefix") {
@@ -77,4 +73,5 @@ public enum RolePolicy {
}
public abstract void handleRoles(Subject subject,Set<Principal>
principals,String discriminator);
+
}
Modified:
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/RolePrincipal.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/RolePrincipal.java?rev=1150913&r1=1150912&r2=1150913&view=diff
==============================================================================
---
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/RolePrincipal.java
(original)
+++
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/RolePrincipal.java
Mon Jul 25 21:11:46 2011
@@ -52,4 +52,5 @@ public class RolePrincipal implements Pr
public String toString() {
return "RolePrincipal[" + name + "]";
}
+
}
Modified:
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/UserPrincipal.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/UserPrincipal.java?rev=1150913&r1=1150912&r2=1150913&view=diff
==============================================================================
---
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/UserPrincipal.java
(original)
+++
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/UserPrincipal.java
Mon Jul 25 21:11:46 2011
@@ -52,4 +52,5 @@ public class UserPrincipal implements Pr
public String toString() {
return "UserPrincipal[" + name + "]";
}
+
}
Modified:
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/encryption/BasicEncryption.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/encryption/BasicEncryption.java?rev=1150913&r1=1150912&r2=1150913&view=diff
==============================================================================
---
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/encryption/BasicEncryption.java
(original)
+++
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/encryption/BasicEncryption.java
Mon Jul 25 21:11:46 2011
@@ -195,5 +195,4 @@ public class BasicEncryption implements
return (dataLength / 3) * 4 + ((modulus == 0) ? 0 : 4);
}
-
}
\ No newline at end of file
Modified:
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/encryption/BasicEncryptionService.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/encryption/BasicEncryptionService.java?rev=1150913&r1=1150912&r2=1150913&view=diff
==============================================================================
---
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/encryption/BasicEncryptionService.java
(original)
+++
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/encryption/BasicEncryptionService.java
Mon Jul 25 21:11:46 2011
@@ -24,4 +24,5 @@ public class BasicEncryptionService impl
public Encryption createEncryption(Map<String, String> params) throws
IllegalArgumentException {
return new BasicEncryption(params);
}
+
}
Modified:
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/encryption/EncryptionSupport.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/encryption/EncryptionSupport.java?rev=1150913&r1=1150912&r2=1150913&view=diff
==============================================================================
---
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/encryption/EncryptionSupport.java
(original)
+++
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/encryption/EncryptionSupport.java
Mon Jul 25 21:11:46 2011
@@ -26,9 +26,6 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
-/**
- * @author iocanel
- */
public class EncryptionSupport {
private final Logger logger =
LoggerFactory.getLogger(EncryptionSupport.class);
@@ -132,4 +129,5 @@ public class EncryptionSupport {
public void setEncryptionPrefix(String encryptionPrefix) {
this.encryptionPrefix = encryptionPrefix;
}
+
}
Modified:
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCBackingEngine.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCBackingEngine.java?rev=1150913&r1=1150912&r2=1150913&view=diff
==============================================================================
---
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCBackingEngine.java
(original)
+++
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCBackingEngine.java
Mon Jul 25 21:11:46 2011
@@ -31,9 +31,6 @@ import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
-/**
- * @author iocanel, jbonofre
- */
public class JDBCBackingEngine implements BackingEngine {
private final Logger logger =
LoggerFactory.getLogger(JDBCBackingEngine.class);
@@ -51,7 +48,6 @@ public class JDBCBackingEngine implement
private String selectUsersQuery = "SELECT USERNAME FROM USERS";
private String selectRolesQuery = "SELECT ROLE FROM ROLES WHERE
USERNAME=?";
-
/**
* Constructor
*
@@ -403,4 +399,5 @@ public class JDBCBackingEngine implement
public void setSelectRolesQuery(String selectRolesQuery) {
this.selectRolesQuery = selectRolesQuery;
}
+
}
Modified:
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCBackingEngineFactory.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCBackingEngineFactory.java?rev=1150913&r1=1150912&r2=1150913&view=diff
==============================================================================
---
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCBackingEngineFactory.java
(original)
+++
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCBackingEngineFactory.java
Mon Jul 25 21:11:46 2011
@@ -26,12 +26,9 @@ import org.slf4j.LoggerFactory;
import javax.sql.DataSource;
import java.util.Map;
-/**
- * @author iocanel
- */
public class JDBCBackingEngineFactory implements BackingEngineFactory {
- private final Logger logger =
LoggerFactory.getLogger(JDBCBackingEngineFactory.class);
+ private static final transient Logger LOGGER =
LoggerFactory.getLogger(JDBCBackingEngineFactory.class);
/**
* Build a Backing engine for the JDBCLoginModule.
@@ -78,7 +75,7 @@ public class JDBCBackingEngineFactory im
instance.setSelectRolesQuery(selectRolesQuery);
}
} catch (Exception e) {
- logger.error("Error creating JDBCBackingEngine.", e);
+ LOGGER.error("Error creating JDBCBackingEngine.", e);
}
return instance;
}
@@ -91,4 +88,5 @@ public class JDBCBackingEngineFactory im
public String getModuleClass() {
return JDBCLoginModule.class.getName();
}
+
}
Modified:
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCLoginModule.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCLoginModule.java?rev=1150913&r1=1150912&r2=1150913&view=diff
==============================================================================
---
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCLoginModule.java
(original)
+++
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCLoginModule.java
Mon Jul 25 21:11:46 2011
@@ -36,12 +36,9 @@ import java.sql.SQLException;
import java.util.HashSet;
import java.util.Map;
-/**
- * @author iocanel
- */
public class JDBCLoginModule extends AbstractKarafLoginModule {
- private final Logger logger =
LoggerFactory.getLogger(PropertiesLoginModule.class);
+ private static final transient Logger LOGGER =
LoggerFactory.getLogger(PropertiesLoginModule.class);
public static final String PASSWORD_QUERY = "query.password";
public static final String ROLE_QUERY = "query.role";
@@ -61,13 +58,12 @@ public class JDBCLoginModule extends Abs
passwordQuery = (String) options.get(PASSWORD_QUERY);
roleQuery = (String) options.get(ROLE_QUERY);
if (datasourceURL == null || datasourceURL.trim().length() == 0) {
- logger.error("No datasource was specified ");
+ LOGGER.error("No datasource was specified ");
} else if (!datasourceURL.startsWith(JDBCUtils.JNDI) &&
!datasourceURL.startsWith(JDBCUtils.OSGI)) {
- logger.error("Invalid datasource lookup protocol");
+ LOGGER.error("Invalid datasource lookup protocol");
}
}
-
public boolean login() throws LoginException {
Connection connection = null;
@@ -156,7 +152,7 @@ public class JDBCLoginModule extends Abs
connection.close();
}
} catch (SQLException ex) {
- logger.warn("Failed to clearly close connection to the
database:", ex);
+ LOGGER.warn("Failed to clearly close connection to the
database:", ex);
}
}
return true;
@@ -170,8 +166,9 @@ public class JDBCLoginModule extends Abs
subject.getPrincipals().removeAll(principals);
principals.clear();
if (debug) {
- logger.debug("logout");
+ LOGGER.debug("logout");
}
return true;
}
+
}
Modified:
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCUtils.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCUtils.java?rev=1150913&r1=1150912&r2=1150913&view=diff
==============================================================================
---
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCUtils.java
(original)
+++
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCUtils.java
Mon Jul 25 21:11:46 2011
@@ -21,9 +21,6 @@ import org.osgi.framework.ServiceReferen
import javax.naming.InitialContext;
-/**
- * @author iocanel
- */
public final class JDBCUtils {
public static final String DATASOURCE = "datasource";
@@ -76,4 +73,5 @@ public final class JDBCUtils {
throw new Exception("Illegal datasource url format");
}
}
+
}
Modified:
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java?rev=1150913&r1=1150912&r2=1150913&view=diff
==============================================================================
---
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java
(original)
+++
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java
Mon Jul 25 21:11:46 2011
@@ -37,12 +37,7 @@ import java.util.Hashtable;
import java.util.Map;
/**
- * <p>
* Karaf JAAS login module which uses a LDAP backend.
- * </p>
- *
- * @author jbonofre
- * @author gnodet
*/
public class LDAPLoginModule extends AbstractKarafLoginModule {
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=1150913&r1=1150912&r2=1150913&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
Mon Jul 25 21:11:46 2011
@@ -28,13 +28,9 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Set;
-
-/**
- * @author iocanel
- */
public class PropertiesBackingEngine implements BackingEngine {
- private final Logger logger =
LoggerFactory.getLogger(PropertiesBackingEngine.class);
+ private static final transient Logger LOGGER =
LoggerFactory.getLogger(PropertiesBackingEngine.class);
private Properties users;
private EncryptionSupport encryptionSupport;
@@ -90,7 +86,7 @@ public class PropertiesBackingEngine imp
try {
users.save();
} catch (Exception ex) {
- logger.error("Cannot update users file,", ex);
+ LOGGER.error("Cannot update users file,", ex);
}
}
@@ -150,7 +146,7 @@ public class PropertiesBackingEngine imp
try {
users.save();
} catch (Exception ex) {
- logger.error("Cannot update users file,", ex);
+ LOGGER.error("Cannot update users file,", ex);
}
}
@@ -185,7 +181,8 @@ public class PropertiesBackingEngine imp
try {
users.save();
} catch (Exception ex) {
- logger.error("Cannot update users file,", ex);
+ LOGGER.error("Cannot update users file,", ex);
}
}
+
}
Modified:
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngineFactory.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngineFactory.java?rev=1150913&r1=1150912&r2=1150913&view=diff
==============================================================================
---
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngineFactory.java
(original)
+++
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngineFactory.java
Mon Jul 25 21:11:46 2011
@@ -27,12 +27,9 @@ import java.io.File;
import java.io.IOException;
import java.util.Map;
-/**
- * @author iocanel
- */
public class PropertiesBackingEngineFactory implements BackingEngineFactory {
- private final Logger logger =
LoggerFactory.getLogger(PropertiesBackingEngineFactory.class);
+ private static final transient Logger LOGGER =
LoggerFactory.getLogger(PropertiesBackingEngineFactory.class);
private static final String USER_FILE = "users";
@@ -53,7 +50,7 @@ public class PropertiesBackingEngineFact
EncryptionSupport encryptionSupport = new
EncryptionSupport(options);
engine = new PropertiesBackingEngine(users, encryptionSupport);
} catch (IOException ioe) {
- logger.warn("Cannot open users file:" + usersFile);
+ LOGGER.warn("Cannot open users file: {}", usersFile);
} finally {
return engine;
}
@@ -67,4 +64,5 @@ public class PropertiesBackingEngineFact
public String getModuleClass() {
return PropertiesLoginModule.class.getName();
}
+
}
Modified:
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesConverter.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesConverter.java?rev=1150913&r1=1150912&r2=1150913&view=diff
==============================================================================
---
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesConverter.java
(original)
+++
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesConverter.java
Mon Jul 25 21:11:46 2011
@@ -47,4 +47,5 @@ public class PropertiesConverter impleme
return properties;
}
+
}
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=1150913&r1=1150912&r2=1150913&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
Mon Jul 25 21:11:46 2011
@@ -38,15 +38,11 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * <p>
* JAAS Login module for user / password, based on two properties files.
- * </p>
- *
- * @author gnodet, jbonofre
*/
public class PropertiesLoginModule extends AbstractKarafLoginModule {
- private final Logger LOG =
LoggerFactory.getLogger(PropertiesLoginModule.class);
+ private static final transient Logger LOGGER =
LoggerFactory.getLogger(PropertiesLoginModule.class);
private static final String USER_FILE = "users";
@@ -57,7 +53,7 @@ public class PropertiesLoginModule exten
usersFile = (String) options.get(USER_FILE) + "";
if (debug) {
- LOG.debug("Initialized debug=" + debug + " usersFile=" +
usersFile);
+ LOGGER.debug("Initialized debug={} usersFile={}", debug,
usersFile);
}
}
@@ -106,10 +102,10 @@ public class PropertiesLoginModule exten
String encryptedPassword = getEncryptedPassword(storedPassword);
if (!storedPassword.equals(encryptedPassword)) {
if (debug) {
- LOG.debug("The password isn't flagged as encrypted, encrypt
it.");
+ LOGGER.debug("The password isn't flagged as encrypted, encrypt
it.");
}
if (debug) {
- LOG.debug("Rebuild the user informations string.");
+ LOGGER.debug("Rebuild the user informations string.");
}
userInfos = encryptedPassword + ",";
for (int i = 1; i < infos.length; i++) {
@@ -120,16 +116,16 @@ public class PropertiesLoginModule exten
}
}
if (debug) {
- LOG.debug("Push back the user informations in the users
properties.");
+ LOGGER.debug("Push back the user informations in the users
properties.");
}
users.put(user, userInfos);
try {
if (debug) {
- LOG.debug("Store the users properties file.");
+ LOGGER.debug("Store the users properties file.");
}
users.save();
} catch (IOException ioe) {
- LOG.warn("Unable to write user properties file " + f, ioe);
+ LOGGER.warn("Unable to write user properties file {}", f, ioe);
}
storedPassword = encryptedPassword;
}
@@ -148,7 +144,7 @@ public class PropertiesLoginModule exten
users.clear();
if (debug) {
- LOG.debug("Successfully logged in " + user);
+ LOGGER.debug("Successfully logged in {}", user);
}
return true;
}
@@ -156,7 +152,7 @@ public class PropertiesLoginModule exten
public boolean abort() throws LoginException {
clear();
if (debug) {
- LOG.debug("abort");
+ LOGGER.debug("abort");
}
return true;
}
@@ -165,8 +161,9 @@ public class PropertiesLoginModule exten
subject.getPrincipals().removeAll(principals);
principals.clear();
if (debug) {
- LOG.debug("logout");
+ LOGGER.debug("logout");
}
return true;
}
+
}
Modified:
karaf/trunk/scheduler/core/src/main/java/org/apache/karaf/scheduler/core/Activator.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/scheduler/core/src/main/java/org/apache/karaf/scheduler/core/Activator.java?rev=1150913&r1=1150912&r2=1150913&view=diff
==============================================================================
---
karaf/trunk/scheduler/core/src/main/java/org/apache/karaf/scheduler/core/Activator.java
(original)
+++
karaf/trunk/scheduler/core/src/main/java/org/apache/karaf/scheduler/core/Activator.java
Mon Jul 25 21:11:46 2011
@@ -21,9 +21,6 @@ import org.osgi.framework.*;
import java.util.Properties;
-/**
- * @author: iocanel
- */
public class Activator implements BundleActivator {
private TaskScheduler scheduler = new TaskScheduler();
@@ -31,7 +28,6 @@ public class Activator implements Bundle
private static final String filter = "(&(objectclass=%s)(&(%s >= 0)(%s >=
0)))";
-
@Override
public void start(BundleContext context) throws Exception {
listener = new RunableServiceListener(context, scheduler);
@@ -48,4 +44,5 @@ public class Activator implements Bundle
public void stop(BundleContext context) throws Exception {
}
+
}
Modified:
karaf/trunk/scheduler/core/src/main/java/org/apache/karaf/scheduler/core/KarafTimerTask.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/scheduler/core/src/main/java/org/apache/karaf/scheduler/core/KarafTimerTask.java?rev=1150913&r1=1150912&r2=1150913&view=diff
==============================================================================
---
karaf/trunk/scheduler/core/src/main/java/org/apache/karaf/scheduler/core/KarafTimerTask.java
(original)
+++
karaf/trunk/scheduler/core/src/main/java/org/apache/karaf/scheduler/core/KarafTimerTask.java
Mon Jul 25 21:11:46 2011
@@ -19,9 +19,6 @@ package org.apache.karaf.scheduler.core;
import java.util.TimerTask;
-/**
- * @author: iocanel
- */
public class KarafTimerTask<R extends Runnable> extends TimerTask {
public static final String ID_PROPERTY =
"org.apache.karaf.scheduler.task.id";
@@ -81,4 +78,5 @@ public class KarafTimerTask<R extends Ru
public void setSchedulePeriod(Long schedulePeriod) {
this.schedulePeriod = schedulePeriod;
}
+
}
Modified:
karaf/trunk/scheduler/core/src/main/java/org/apache/karaf/scheduler/core/RunableServiceListener.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/scheduler/core/src/main/java/org/apache/karaf/scheduler/core/RunableServiceListener.java?rev=1150913&r1=1150912&r2=1150913&view=diff
==============================================================================
---
karaf/trunk/scheduler/core/src/main/java/org/apache/karaf/scheduler/core/RunableServiceListener.java
(original)
+++
karaf/trunk/scheduler/core/src/main/java/org/apache/karaf/scheduler/core/RunableServiceListener.java
Mon Jul 25 21:11:46 2011
@@ -22,9 +22,6 @@ import org.osgi.framework.ServiceEvent;
import org.osgi.framework.ServiceListener;
import org.osgi.framework.ServiceReference;
-/**
- * @author: iocanel
- */
public class RunableServiceListener implements ServiceListener {
private final BundleContext bundleContext;
@@ -84,4 +81,5 @@ public class RunableServiceListener impl
String id = (String) reference.getProperty(KarafTimerTask.ID_PROPERTY);
scheduler.unschedule(id);
}
+
}
Modified:
karaf/trunk/scheduler/core/src/main/java/org/apache/karaf/scheduler/core/TaskScheduler.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/scheduler/core/src/main/java/org/apache/karaf/scheduler/core/TaskScheduler.java?rev=1150913&r1=1150912&r2=1150913&view=diff
==============================================================================
---
karaf/trunk/scheduler/core/src/main/java/org/apache/karaf/scheduler/core/TaskScheduler.java
(original)
+++
karaf/trunk/scheduler/core/src/main/java/org/apache/karaf/scheduler/core/TaskScheduler.java
Mon Jul 25 21:11:46 2011
@@ -21,9 +21,6 @@ import java.util.Map;
import java.util.Timer;
import java.util.concurrent.ConcurrentHashMap;
-/**
- * @author: iocanel
- */
public class TaskScheduler {
private final Timer timer = new Timer();
@@ -53,4 +50,5 @@ public class TaskScheduler {
}
}
}
+
}
Modified: karaf/trunk/scheduler/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/scheduler/pom.xml?rev=1150913&r1=1150912&r2=1150913&view=diff
==============================================================================
--- karaf/trunk/scheduler/pom.xml (original)
+++ karaf/trunk/scheduler/pom.xml Mon Jul 25 21:11:46 2011
@@ -1,38 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- 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.
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+
+ <!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ 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.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<artifactId>karaf</artifactId>
<groupId>org.apache.karaf</groupId>
<version>3.0.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.karaf</groupId>
<artifactId>scheduler</artifactId>
- <name>Apache Karaf :: Scheduler</name>
<packaging>pom</packaging>
+ <name>Apache Karaf :: Scheduler</name>
<modules>
<module>core</module>
</modules>
-
</project>
\ No newline at end of file
Modified:
karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/info/InfoProvider.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/info/InfoProvider.java?rev=1150913&r1=1150912&r2=1150913&view=diff
==============================================================================
---
karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/info/InfoProvider.java
(original)
+++
karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/info/InfoProvider.java
Mon Jul 25 21:11:46 2011
@@ -18,9 +18,6 @@ package org.apache.karaf.shell.commands.
import java.util.Properties;
-/**
- * @author iocanel
- */
public interface InfoProvider {
public String getName();
