Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ public void testBuildTheJNLPAppWhenAppNamePropIsNotSet() throws Exception {
//
// List l = Arrays.asList(p.getSupportedActions());
// assertTrue("We support build-jnlp: " + l, l.contains("build-jnlp"));
///*
// /*
// WeakReference<?> ref = new WeakReference<Object>(suite);
// suite = null;
// assertGC("Project can go away", ref);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public void process(final Context ctx) throws Exception {
if (file.getPath().contains(FACTORIES_FOLDER)) { // its a factory
processFactories(ctx, file);
}
///// Actions
// Actions
if (file.getPath().endsWith(ACTIONS_FOLDER)) {
processActions(ctx, file);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,7 @@ private static void writeManifest(FileObject fo, EditableManifest manifest) {



///------- copied from MoveRefactoringPlugin
//------- copied from MoveRefactoringPlugin

private void setup(Collection fileObjects, String postfix, boolean recursively) {
for (Iterator i = fileObjects.iterator(); i.hasNext(); ) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,7 @@ public JBDeploymentManager(DeploymentFactory df, String realUri,
this.df = df;
}

////////////////////////////////////////////////////////////////////////////
// Connection data methods
////////////////////////////////////////////////////////////////////////////
public String getHost() {
String host = InstanceProperties.getInstanceProperties(realUri).
getProperty(JBPluginProperties.PROPERTY_HOST);
Expand Down Expand Up @@ -427,9 +425,7 @@ private void killRemotingThreads(Set<Thread> threads) {
}
}

////////////////////////////////////////////////////////////////////////////
// Methods for retrieving server instance state
////////////////////////////////////////////////////////////////////////////
/**
* Returns true if the given instance properties are present in the map and value equals true.
* Otherwise return false.
Expand All @@ -453,9 +449,7 @@ public boolean isAs7() {
}
return as7;
}
////////////////////////////////////////////////////////////////////////////
// DeploymentManager Implementation
////////////////////////////////////////////////////////////////////////////
public ProgressObject distribute(Target[] target, File file, File file2) throws IllegalStateException {
if (isAs7()) {
return new JB7Deployer(realUri, this).deploy(target, file, file2, getHost(), getPort());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -257,9 +257,7 @@ private void fireChangeEvent() {
}
}

////////////////////////////////////////////////////////////////////////////
// Inner Classes
////////////////////////////////////////////////////////////////////////////
/**
* Simple key listener that delegates the event to its parent's listeners
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -358,9 +358,7 @@ public void setServerVersion(Version serverVersion) {
this.serverVersion = serverVersion;
}

////////////////////////////////////////////////////////////////////////////
// Panels section
////////////////////////////////////////////////////////////////////////////
/**
* The steps names for the wizard: Server Location & Instance properties
*/
Expand Down Expand Up @@ -486,9 +484,7 @@ private void initComponent(Component c, int step) {
}


////////////////////////////////////////////////////////////////////////////
// Listeners section
////////////////////////////////////////////////////////////////////////////
/**
* The registered listeners
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,7 @@
*/
public abstract class BasicTask<V> implements Callable<V> {

////////////////////////////////////////////////////////////////////////////
// Inner classes //
////////////////////////////////////////////////////////////////////////////

// Inner classes
/**
* Notification about server state check results while waiting for server
* to start.
Expand All @@ -58,20 +55,14 @@ public abstract class BasicTask<V> implements Callable<V> {
*/
protected static class StartStateListener extends WakeUpStateListener {

////////////////////////////////////////////////////////////////////////
// Instance attributes //
////////////////////////////////////////////////////////////////////////

// Instance attributes
/** Is server starting in profiling mode? */
private final boolean profile;

/** GlassFish process being started. */
private volatile Process process;

////////////////////////////////////////////////////////////////////////
// Constructors //
////////////////////////////////////////////////////////////////////////

// Constructors
/**
* Constructs an instance of state check results notification.
* <p/>
Expand All @@ -84,10 +75,7 @@ protected StartStateListener(final boolean profile) {
this.process = null;
}

////////////////////////////////////////////////////////////////////////
// Getters and setters //
////////////////////////////////////////////////////////////////////////

// Getters and setters
/**
* Set GlassFish process being started.
* <p/>
Expand All @@ -97,10 +85,7 @@ void setProcess(final Process process) {
this.process = process;
}

////////////////////////////////////////////////////////////////////////
// Methods //
////////////////////////////////////////////////////////////////////////

// Methods
/**
* Callback to notify about current server status after every check
* when enabled.
Expand Down Expand Up @@ -142,21 +127,15 @@ public void currentState(final GlassFishServer server,
*/
protected static class ShutdownStateListener extends WakeUpStateListener {

////////////////////////////////////////////////////////////////////////
// Constructors //
////////////////////////////////////////////////////////////////////////

// Constructors
/**
* Constructs an instance of state check results notification.
*/
protected ShutdownStateListener() {
super();
}

////////////////////////////////////////////////////////////////////////
// Methods //
////////////////////////////////////////////////////////////////////////

// Methods
/**
* Callback to notify about current server status after every check
* when enabled.
Expand All @@ -183,10 +162,7 @@ public void currentState(final GlassFishServer server,
*/
protected static class StateChange {

////////////////////////////////////////////////////////////////////////
// Instance attributes //
////////////////////////////////////////////////////////////////////////

// Instance attributes
/** Command execution task. */
private final BasicTask<?> task;

Expand All @@ -202,10 +178,7 @@ protected static class StateChange {
/** Message arguments. */
private final String[] msgArgs;

////////////////////////////////////////////////////////////////////////
// Constructors //
////////////////////////////////////////////////////////////////////////

// Constructors
/**
* Constructs an instance of state change request data.
* <p/>
Expand Down Expand Up @@ -242,10 +215,7 @@ protected StateChange(final BasicTask<?> task, final TaskState result,
this.msgArgs = msgArgs;
}

////////////////////////////////////////////////////////////////////////
// Methods //
////////////////////////////////////////////////////////////////////////

// Methods
/**
* Call all registered callback listeners to inform about state change.
* <p/>
Expand All @@ -257,10 +227,7 @@ protected TaskState fireOperationStateChanged() {
}
}

////////////////////////////////////////////////////////////////////////////
// Class attributes //
////////////////////////////////////////////////////////////////////////////

// Class attributes
/** Local logger. */
private static final Logger LOGGER = GlassFishLogger.get(BasicTask.class);

Expand All @@ -286,10 +253,7 @@ protected TaskState fireOperationStateChanged() {
/** Unit (ms) for the DELAY and START_TIMEOUT constants. */
public static final TimeUnit TIMEUNIT = TimeUnit.MILLISECONDS;

////////////////////////////////////////////////////////////////////////////
// Instance attributes //
////////////////////////////////////////////////////////////////////////////

// Instance attributes
/** GlassFish instance accessed in this task. */
GlassfishInstance instance;

Expand All @@ -302,10 +266,7 @@ protected TaskState fireOperationStateChanged() {
/** Task thread when inside <code>call</code> method. */
protected volatile Thread taskThread;

////////////////////////////////////////////////////////////////////////////
// Abstract methods //
////////////////////////////////////////////////////////////////////////////

// Abstract methods
/**
* Command execution is implemented as <code>call()</code> method in child
* classes.
Expand All @@ -315,10 +276,7 @@ protected TaskState fireOperationStateChanged() {
@Override
public abstract V call();

////////////////////////////////////////////////////////////////////////////
// Constructors //
////////////////////////////////////////////////////////////////////////////

// Constructors
/**
* Constructs an instance of <code>BasicTask</code> class.
* <p/>
Expand All @@ -334,10 +292,7 @@ protected BasicTask(GlassfishInstance instance,
this.taskThread = null;
}

////////////////////////////////////////////////////////////////////////////
// Methods //
////////////////////////////////////////////////////////////////////////////

// Methods
/**
* Initialize task thread when <code>call</code> method is started.
* <p/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,7 @@
public class CommonServerSupport
implements GlassfishModule3, RefreshModulesCookie {

////////////////////////////////////////////////////////////////////////////
// Inner classes //
////////////////////////////////////////////////////////////////////////////

/**
* Task state listener watching __locations command execution.
*/
Expand Down Expand Up @@ -226,10 +223,7 @@ public void operationStateChanged(final TaskState newState,
}
};

////////////////////////////////////////////////////////////////////////////
// Class attributes //
////////////////////////////////////////////////////////////////////////////

/** Local logger. */
private static final Logger LOGGER
= GlassFishLogger.get(CommonServerSupport.class);
Expand All @@ -240,10 +234,7 @@ public void operationStateChanged(final TaskState newState,
/** String to return for failed {@see getHttpHostFromServer()} search. */
private static final String FAILED_HTTP_HOST = LOCALHOST + "FAIL";

////////////////////////////////////////////////////////////////////////////
// Static methods //
////////////////////////////////////////////////////////////////////////////

/**
* Display pop up window with given message.
* <p/>
Expand All @@ -262,10 +253,7 @@ public static void displayPopUpMessage(final CommonServerSupport css,
}
}

////////////////////////////////////////////////////////////////////////////
// Instance attributes //
////////////////////////////////////////////////////////////////////////////

/** Managed GlassFish instance. */
private final GlassfishInstance instance;

Expand All @@ -290,10 +278,7 @@ public static void displayPopUpMessage(final CommonServerSupport css,
/** Last executed start task. */
private volatile FutureTask<TaskState> startTask;

////////////////////////////////////////////////////////////////////////////
// Constructors //
////////////////////////////////////////////////////////////////////////////

CommonServerSupport(GlassfishInstance instance) {
this.instance = instance;
this.isRemote = instance.isRemote();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,26 +35,17 @@
* @author vkraemer
*/
public class EnableComet implements Runnable {
////////////////////////////////////////////////////////////////////////////
// Class attributes //
////////////////////////////////////////////////////////////////////////////

/** Local logger. */
private static final Logger LOGGER
= GlassFishLogger.get(CommonServerSupport.class);


////////////////////////////////////////////////////////////////////////////
// Instance attributes //
////////////////////////////////////////////////////////////////////////////

/** GlassFish server instance to be modified. */
private final GlassfishInstance instance;

////////////////////////////////////////////////////////////////////////////
// Constructors //
////////////////////////////////////////////////////////////////////////////

/**
* Creates an instance of Comet support enable handler.
* @param instance GlassFish server instance to be modified.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,7 @@
*/
public class GlassFishExecutors {

////////////////////////////////////////////////////////////////////////////
// Inner classes //
////////////////////////////////////////////////////////////////////////////

/**
* GlassFish log fetchers executor {@see ThreadFactory}.
* <p/>
Expand Down Expand Up @@ -78,10 +75,7 @@ public Thread newThread(Runnable r) {
}
}

////////////////////////////////////////////////////////////////////////////
// Class attributes //
////////////////////////////////////////////////////////////////////////////

/** Top level thread group name. */
private static final String THREAD_GROUP_NAME_TOP = "GlassFish";

Expand Down Expand Up @@ -125,10 +119,7 @@ public Thread newThread(Runnable r) {
new LinkedBlockingQueue<Runnable>(),
new FetchLogThreadFactory());

////////////////////////////////////////////////////////////////////////////
// Static methods - class attributes initializers //
////////////////////////////////////////////////////////////////////////////

/**
* Initialize top level {@see ThreadGroup} object for threads being created
* in thread factories.
Expand Down Expand Up @@ -169,10 +160,7 @@ private static ThreadGroup initTgStat() {
return new ThreadGroup(tgTop, THREAD_GROUP_NAME_STAT);
}

////////////////////////////////////////////////////////////////////////////
// Static methods //
////////////////////////////////////////////////////////////////////////////

/**
* {@see ExecutorService} class instance for running log fetchers.
* <p/>
Expand Down
Loading
Loading