Trimming trailing spaces, removing tabs by a script
- using tab width of 4 spaces
- trailing space in property files is converted to unicode, so it is
visible in sources
- bat files use CRLF
- all other text files use just LF
diff --git a/appserver/osgi-platforms/felix-webconsole-extension/pom.xml b/appserver/osgi-platforms/felix-webconsole-extension/pom.xml
index a994aab..ea28216 100644
--- a/appserver/osgi-platforms/felix-webconsole-extension/pom.xml
+++ b/appserver/osgi-platforms/felix-webconsole-extension/pom.xml
@@ -27,13 +27,13 @@
</parent>
<artifactId>felix-webconsole-extension</artifactId>
<packaging>glassfish-jar</packaging>
-
+
<name>Felix Web Console Extension for GlassFish</name>
<description>
- Felix Web Console Extension for GlassFish.
+ Felix Web Console Extension for GlassFish.
This custoimizes branding, HttpService selection and provides security integration.
</description>
-
+
<developers>
<developer>
<name>Sahoo</name>
diff --git a/appserver/osgi-platforms/felix-webconsole-extension/src/main/java/org/glassfish/osgi/felixwebconsoleextension/FelixWebConsoleExtensionActivator.java b/appserver/osgi-platforms/felix-webconsole-extension/src/main/java/org/glassfish/osgi/felixwebconsoleextension/FelixWebConsoleExtensionActivator.java
index 103af2a..be9da19 100644
--- a/appserver/osgi-platforms/felix-webconsole-extension/src/main/java/org/glassfish/osgi/felixwebconsoleextension/FelixWebConsoleExtensionActivator.java
+++ b/appserver/osgi-platforms/felix-webconsole-extension/src/main/java/org/glassfish/osgi/felixwebconsoleextension/FelixWebConsoleExtensionActivator.java
@@ -40,7 +40,7 @@
* @author tangyong@cn.fujitsu.com
*/
public class FelixWebConsoleExtensionActivator implements BundleActivator {
-
+
private Logger logger = Logger.getLogger(getClass().getPackage().getName());
private BundleContext context;
private static final String WEBCONSOLE_PID = "org.apache.felix.webconsole.internal.servlet.OsgiManager";
@@ -58,14 +58,14 @@
registerWebConsoleSecurityProvider(); // GLASSFISH-12975
}
- private void registerWebConsoleSecurityProvider() {
- final GlassFishSecurityProvider secprovider = new GlassFishSecurityProvider();
- secprovider.setBundleContext(context);
+ private void registerWebConsoleSecurityProvider() {
+ final GlassFishSecurityProvider secprovider = new GlassFishSecurityProvider();
+ secprovider.setBundleContext(context);
context.registerService(WebConsoleSecurityProvider.class.getName(), secprovider, null);
logger.logp(Level.INFO, "FelixWebConsoleExtensionActivator", "start", "Registered {0}", new Object[]{secprovider});
- }
+ }
- private void configureConsole() {
+ private void configureConsole() {
tracker = new ServiceTracker(context, ConfigurationAdmin.class.getName(), null) {
@Override
public Object addingService(ServiceReference reference) {
diff --git a/appserver/osgi-platforms/felix-webconsole-extension/src/main/java/org/glassfish/osgi/felixwebconsoleextension/GlassFishSecurityProvider.java b/appserver/osgi-platforms/felix-webconsole-extension/src/main/java/org/glassfish/osgi/felixwebconsoleextension/GlassFishSecurityProvider.java
index cf6648e..05320fd 100644
--- a/appserver/osgi-platforms/felix-webconsole-extension/src/main/java/org/glassfish/osgi/felixwebconsoleextension/GlassFishSecurityProvider.java
+++ b/appserver/osgi-platforms/felix-webconsole-extension/src/main/java/org/glassfish/osgi/felixwebconsoleextension/GlassFishSecurityProvider.java
@@ -35,15 +35,15 @@
* @author sanjeeb.sahoo@oracle.com
*/
public class GlassFishSecurityProvider implements WebConsoleSecurityProvider {
-
- private BundleContext ctx;
- private GlassFish gf;
-
- public void setBundleContext(BundleContext context){
- ctx = context;
- }
-
- private GlassFish getGlassFish() {
+
+ private BundleContext ctx;
+ private GlassFish gf;
+
+ public void setBundleContext(BundleContext context){
+ ctx = context;
+ }
+
+ private GlassFish getGlassFish() {
GlassFish gf = (GlassFish) ctx.getService(ctx.getServiceReference(GlassFish.class.getName()));
try {
assert(gf.getStatus() == GlassFish.Status.STARTED);
@@ -53,28 +53,28 @@
return gf;
}
- @Override
- public Object authenticate(String username, String password) {
- gf = getGlassFish();
- AuthenticationService authService = null;
- try{
+ @Override
+ public Object authenticate(String username, String password) {
+ gf = getGlassFish();
+ AuthenticationService authService = null;
+ try{
authService = getAuthService();
- }catch(GlassFishException gfe){
- gfe.printStackTrace();
- return null;
- }
+ }catch(GlassFishException gfe){
+ gfe.printStackTrace();
+ return null;
+ }
Subject fs = null;
try {
- fs = authService.login(username, password.toCharArray(), fs);
- } catch (LoginException e) {
+ fs = authService.login(username, password.toCharArray(), fs);
+ } catch (LoginException e) {
e.printStackTrace();
return null;
}
- return fs;
- }
+ return fs;
+ }
private AuthenticationService getAuthService() throws GlassFishException {
// Authentication Service is protected, so we need to access within doPrivileged
@@ -94,8 +94,8 @@
}
@Override
- public boolean authorize(Object user, String role) {
- // TODO Auto-generated method stub
- return false;
- }
+ public boolean authorize(Object user, String role) {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
diff --git a/appserver/osgi-platforms/glassfish-osgi-console-plugin/pom.xml b/appserver/osgi-platforms/glassfish-osgi-console-plugin/pom.xml
index 107fd60..ad8c3e2 100644
--- a/appserver/osgi-platforms/glassfish-osgi-console-plugin/pom.xml
+++ b/appserver/osgi-platforms/glassfish-osgi-console-plugin/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>glassfish-osgi-console-plugin</artifactId>
<packaging>glassfish-jar</packaging>
-
+
<name>GlassFish OSGi Console Plugin</name>
<description>OSGi Console Plugin for GlassFish Administration Console</description>
diff --git a/appserver/osgi-platforms/glassfish-osgi-console-plugin/src/main/java/org/glassfish/osgi/admingui/OSGIConsoleHandlers.java b/appserver/osgi-platforms/glassfish-osgi-console-plugin/src/main/java/org/glassfish/osgi/admingui/OSGIConsoleHandlers.java
index 66fc2c2..2821e3a 100644
--- a/appserver/osgi-platforms/glassfish-osgi-console-plugin/src/main/java/org/glassfish/osgi/admingui/OSGIConsoleHandlers.java
+++ b/appserver/osgi-platforms/glassfish-osgi-console-plugin/src/main/java/org/glassfish/osgi/admingui/OSGIConsoleHandlers.java
@@ -30,7 +30,7 @@
/**
* handler to get instance's host and port information which is used to
* form the http url for osgi-console.
- *
+ *
* @author mohit
*/
public class OSGIConsoleHandlers {
@@ -70,7 +70,7 @@
Node node = domain.getNodeNamed(server.getNodeRef());
String host = node.getNodeHost();
String consoleUrl = "http://" + host + ":" + port + consolePath;
-
+
handlerCtx.setOutputValue("consoleUrl", consoleUrl);
}
diff --git a/appserver/osgi-platforms/glassfish-osgi-console-plugin/src/main/java/org/glassfish/osgi/admingui/OSGIConsoleProvider.java b/appserver/osgi-platforms/glassfish-osgi-console-plugin/src/main/java/org/glassfish/osgi/admingui/OSGIConsoleProvider.java
index 6013c17..7cb30d3 100644
--- a/appserver/osgi-platforms/glassfish-osgi-console-plugin/src/main/java/org/glassfish/osgi/admingui/OSGIConsoleProvider.java
+++ b/appserver/osgi-platforms/glassfish-osgi-console-plugin/src/main/java/org/glassfish/osgi/admingui/OSGIConsoleProvider.java
@@ -22,7 +22,7 @@
/**
*
- * @author Mohit
+ * @author Mohit
*/
@Service
@@ -30,11 +30,11 @@
/**
* <p> Returns the URL of the Integration Point configuration file
- * console-config.xml </p>
+ * console-config.xml </p>
*
* @return URL of configration file.
*/
- public URL getConfiguration(){
+ public URL getConfiguration(){
return null;
}
}
diff --git a/appserver/osgi-platforms/glassfish-osgi-console-plugin/src/main/resources/org/glassfish/osgi/admingui/Helplinks.properties b/appserver/osgi-platforms/glassfish-osgi-console-plugin/src/main/resources/org/glassfish/osgi/admingui/Helplinks.properties
index 19d17bf..20aee08 100644
--- a/appserver/osgi-platforms/glassfish-osgi-console-plugin/src/main/resources/org/glassfish/osgi/admingui/Helplinks.properties
+++ b/appserver/osgi-platforms/glassfish-osgi-console-plugin/src/main/resources/org/glassfish/osgi/admingui/Helplinks.properties
@@ -16,6 +16,6 @@
##############################
-# OSGI Administration Console
+# OSGI Administration Console
##############################
